aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-09 01:03:57 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-09 01:03:57 -0800
commit69aeddd185deb28bf0228ca49e101538b966eb81 (patch)
tree6f42c67db1950b76bf81588216d9ecdd68c9b251 /version.inc
parent11c8cabf28a23383979ceb33ec8264ae2b732f3e (diff)
parent99bd69adfe3ad578d6937cfc03e333d4913881c6 (diff)
downloadvolse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.tar.gz
volse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.tar.bz2
volse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: README.md version.inc
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index 67da5b0b8..11ca984f2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1,2 @@
-2015-11-08.1210
+2015-11-09.1211
+