aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-11 06:42:11 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-11 06:42:11 +0200
commitedb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch)
tree18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /version.inc
parent2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff)
parentf2171173fe2c9a0596672da293eb756a514ff789 (diff)
downloadvolse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz
volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2
volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.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 da2499cde..763c01a75 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-02.1143
+2015-09-10.1151