aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-20 11:16:13 -0800
commit5ad79e3f044a3ac5647909bff77d0954fbf96c0f (patch)
tree756e352064e872f233e9cf167a1cc36189162bdc /version.inc
parente3b0b5ed52a2ad4f3cdd0c8cd1911a5345e50586 (diff)
parent7a1b345bc2b4ef6d7f9e1c37a3e3ab689ebc6fb0 (diff)
downloadvolse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.gz
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.tar.bz2
volse-hubzilla-5ad79e3f044a3ac5647909bff77d0954fbf96c0f.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 97d0c5a13..dceda9119 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-19.864
+2014-11-20.865