diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-24 07:23:43 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-24 07:23:43 +0100 |
commit | 2b2723cb74dd74fc449d76f29edd7797b16c7e84 (patch) | |
tree | 23e002e6e22211e3dba7742a4ea50ffc14653f95 /version.inc | |
parent | 7338649fa54a109122deecc743079eab6b9c1251 (diff) | |
parent | e485ecb3b453a50a1974992b5ccf5122e154a5dc (diff) | |
download | volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.tar.gz volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.tar.bz2 volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.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 c6bcb1648..211f6c438 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-22.1224 +2015-11-23.1225 |