aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-24 15:50:05 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-24 15:50:05 -0700
commit851f2f64df284d4ec410cdf7511b365db9fc5e9b (patch)
tree81484c475285226961b51240dd071197b7021791 /version.inc
parent5795e2a58bb4a0702a3d318ec6ac05681d6e5864 (diff)
parent13546167877322afa274a2540656f525e55d3b48 (diff)
downloadvolse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.tar.gz
volse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.tar.bz2
volse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: index.php mod/setup.php
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 cae357807..889588612 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-21.1039
+2015-05-23.1041