aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:56:47 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:56:47 +0100
commit519862115c143cf3f645a172f39e5a0b4dc9d5bb (patch)
tree63ea16a7629d5cfad059fa581c0fac3048f26fe4 /version.inc
parent4d97ea106cf45f9dd191358dc6bde3a7fab438c1 (diff)
parentd3aa50c9c3d530af8b0384267c5db5a05f9ff49a (diff)
downloadvolse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.tar.gz
volse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.tar.bz2
volse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.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 7e47edd58..ed529cb60 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-27.1229
+2015-11-28.1230