aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-27 17:24:05 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-27 17:24:05 +0100
commitc766cf9565129b762998e709f5ee7c3eb14cffca (patch)
treec462e39540d6f63e30d10aca1c64ffefcfa4d4ef /version.inc
parente4674142c6a205651d4bb207aa038e6d089da73f (diff)
parent722d7ff38d5bbf49a7c990d9219998c2c8a5b58f (diff)
downloadvolse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.gz
volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.bz2
volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.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 7b8a8ab83..a9ccde1f5 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-24.1288H
+2016-01-27.1291H