aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-03 18:12:02 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-03 18:12:02 +0200
commitadfc748bfa724ad8cc9d4ebf6f9d095fc56fb936 (patch)
tree2d5e256b6bb001397939debad609789367745fc9 /version.inc
parent2ce1e3678acd59409f1013433db99df6624c2895 (diff)
parentf3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff)
downloadvolse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.gz
volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.bz2
volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.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 cafba0e02..da2499cde 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-31.1141
+2015-09-02.1143