diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-23 14:16:14 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-23 14:16:14 +0100 |
commit | 7338649fa54a109122deecc743079eab6b9c1251 (patch) | |
tree | fcce0bb728f3d7204201ee7f5f182a57cfd5d2c6 /version.inc | |
parent | e60f527cb09dacf7b81af37a15c890c6dfbe1bb0 (diff) | |
parent | ae1103c5a3f3f76a0269cbb5de11a7cb96496ad3 (diff) | |
download | volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.gz volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.bz2 volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.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 625be791e..c6bcb1648 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-20.1223 +2015-11-22.1224 |