diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
commit | 36ac48779c85ae324d2d702714677e360af5930d (patch) | |
tree | f6e78cb3cefe3abf5dcac291938005d75ecb0bff /version.inc | |
parent | 0cd82ec680e6a5a352781861a63685038fea723a (diff) | |
parent | 88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff) | |
download | volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2 volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'version.inc')
-rw-r--r-- | version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc index 1c457edcc..fa80bc80a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-29.1293H +2016-02-01.1296H |