aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-04 20:05:59 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-04 20:05:59 +0100
commitd2d71b86302385af27570d8ea3ca2e4009ac5d34 (patch)
treee3503058642429ccd1e22afa8a744dde5b7427d0 /version.inc
parent86dd4e7ee03c5c95eed9830c81aafdd0346d71f3 (diff)
parentc3e2505b669711cc1f163f6eebf8852708192d2b (diff)
downloadvolse-hubzilla-d2d71b86302385af27570d8ea3ca2e4009ac5d34.tar.gz
volse-hubzilla-d2d71b86302385af27570d8ea3ca2e4009ac5d34.tar.bz2
volse-hubzilla-d2d71b86302385af27570d8ea3ca2e4009ac5d34.zip
Merge remote-tracking branch 'upstream/master'
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 479ab9124..8a363fc45 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-01.1264
+2016-01-04.1268H