aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-28 19:06:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-28 19:06:31 -0700
commit8fe3daab21f9aba00f7def3553247b0cbcf5f94a (patch)
tree3e8b22ef3b197e4dbdba3e86f7427452d1cd6b73 /version.inc
parentb381ec57346a6d7724b2317c120ce2e6e70edc37 (diff)
parentdf5223fe9813a2f6bee053c1c3c6acbdbaf6d42f (diff)
downloadvolse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.gz
volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.bz2
volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.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 2dbf2a1b8..57c90a3d0 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-27.1045
+2015-05-28.1046