aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-20 21:29:41 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-20 21:29:41 +0200
commit099f236f45b30391ae0fa13ef067309ae2b2ddbc (patch)
tree0abb523482648ad2e33b43f74a154de306b62a5c /version.inc
parent5a7e8d8520601b3c08ef15c520da19d05b31d23b (diff)
parent996cd7e2aba37ce2c4613753a68552c92dcb9be9 (diff)
downloadvolse-hubzilla-099f236f45b30391ae0fa13ef067309ae2b2ddbc.tar.gz
volse-hubzilla-099f236f45b30391ae0fa13ef067309ae2b2ddbc.tar.bz2
volse-hubzilla-099f236f45b30391ae0fa13ef067309ae2b2ddbc.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 2d7153d51..e412e1495 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-18.1159
+2015-09-20.1161