aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-29 03:39:07 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-29 03:39:07 -0700
commitbc02b933727da7a000d43d2d7d495f066616dc81 (patch)
treee590b70757edb94655872f5b992f143cead61eb3 /version.inc
parentfc12123329133cea39f27615a7c24c57e5b4a35d (diff)
parent7d9f785758ee6e4c19838e532f9930e227e95fc6 (diff)
downloadvolse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.gz
volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.bz2
volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.zip
Merge remote 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 1984d7bf1..252e701a2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-14.828
+2014-10-28.842