aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-27 17:57:59 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-27 17:57:59 +0200
commit1b82fb7349a7a4048755d92e757efc5dc227b227 (patch)
treee614f70f830ed518b185f22203f42c91aea36db0 /version.inc
parent092e7378cdaeefaa7b4a954bd865bba1960f01aa (diff)
parent7b28c42693ff41da61abe4974c7a0a7412b6d6e5 (diff)
downloadvolse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.gz
volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.tar.bz2
volse-hubzilla-1b82fb7349a7a4048755d92e757efc5dc227b227.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 a8c435908..988848405 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-20.1130
+2015-08-26.1136