aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-05 12:48:46 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-05 12:48:46 -0800
commit10db51e6c2f16f13b55abc0a23513cac90a311a4 (patch)
treefab28e9707dc2ed18936d8f7bb428b0b3a360a0d /version.inc
parent4cab74c18cf237eae6c57baea2b1d4fd260fe590 (diff)
parent61aa33af1d30f047af709d7f513357e62c8307c3 (diff)
downloadvolse-hubzilla-10db51e6c2f16f13b55abc0a23513cac90a311a4.tar.gz
volse-hubzilla-10db51e6c2f16f13b55abc0a23513cac90a311a4.tar.bz2
volse-hubzilla-10db51e6c2f16f13b55abc0a23513cac90a311a4.zip
Merge branch 'master' into dev
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index 8282941e1..ca9a1ee72 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-03.1235
+2015-12-05.1237