aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-07 16:13:22 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-07 16:13:22 -0700
commitc01a9839577a5fc3a8965713e206616edc586c74 (patch)
treec9aa6cf42c2146bf5cee0a11a37ba6c93ef401d3 /version.inc
parent6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (diff)
parentd94f6f7c53fbb01a76a6d3beb14968d02ebb3afa (diff)
downloadvolse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.gz
volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.bz2
volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.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 3a7d86ed7..203193fb7 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-05.819
+2014-10-07.821