diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-12-20 14:55:43 -0800 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-20 14:55:43 -0800 |
commit | f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4 (patch) | |
tree | abce5d057b603d8e196ea74726c3fde485b43a83 /version.inc | |
parent | 61fa97baabd5fbb1b809b67e3ae717bd05fdbfd0 (diff) | |
download | volse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.tar.gz volse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.tar.bz2 volse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.zip |
merge hell
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 4887ba16b..75d1e127a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-12-18.1250 +2015-12-20.1252 |