aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
commite07ff7d3fbb9bef720831dc71470b70a882abfdf (patch)
tree68934f0deb2fb9edef69954d1016734bc8662957 /version.inc
parentb22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff)
parente769fbaffb09aa673d7475c598e7df7e7978d210 (diff)
downloadvolse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.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 e621e16cb..80d66264c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-23.1164
+2015-09-28.1169