aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-23 15:54:46 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-23 15:54:46 +0200
commit092e7378cdaeefaa7b4a954bd865bba1960f01aa (patch)
tree43a01ef991aae0e394d6c0645f84cbc7b856f972 /version.inc
parente50e68719155c7d35e30bb203a403854f789d5a1 (diff)
parent2a59392ba8be974a5deec2e6f15959fde21186ea (diff)
downloadvolse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.tar.gz
volse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.tar.bz2
volse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.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 807ab4e76..a8c435908 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-18.1128
+2015-08-20.1130