aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-17 03:20:20 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-17 03:20:20 -0800
commit333f3b17152475e780cc5a9fbedaf3b03dfb2cce (patch)
tree8aaa0a8cd7ddc00630c38a85121124e824e35e7b /version.inc
parent2dbecf95454993cdf4996d2d65463d7759cd479b (diff)
parentb11ed7f88e4683315a4f5aa02692cb61facf32a7 (diff)
downloadvolse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.gz
volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.bz2
volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.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 d86614502..664554361 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-13.858
+2014-11-16.861