aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-26 11:02:30 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-26 11:02:30 -0800
commitd3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5 (patch)
tree0dd876ff9767998ec13c73cab2ff02f5cbce371a /version.inc
parent1a57f3ed517e7dd68bd6c7a23802ebee138c128f (diff)
parent3bb0ef8a82ec660ff8ef37b9abc93da94234649a (diff)
downloadvolse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.gz
volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.bz2
volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.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 dceda9119..b6da826d4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-20.865
+2014-11-24.869