diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:30:08 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-15 17:30:08 -0700 |
commit | 8c7472c6c337f0cf58d744433e3de70ab33b430b (patch) | |
tree | 293bb3b84407475c380b11c015f9086138ef3766 /version.inc | |
parent | 859a2ac8ef1c3ce234b894598be846cbc89cf54a (diff) | |
parent | e0779e32b42e0fc00cd060f2baa25656d15b7885 (diff) | |
download | volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.gz volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.tar.bz2 volse-hubzilla-8c7472c6c337f0cf58d744433e3de70ab33b430b.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'version.inc')
-rw-r--r-- | version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc index 2a5419bb9..4e53758a0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-13.1062 +2015-06-14.1063 |