diff options
author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
tree | a73ed07970a517dbad90f14954fea790193813c3 /version.inc | |
parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip |
Merge branch 'master' into newevent
Conflicts:
include/zot.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 101a79e18..a14b886b0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-05-07.668 +2014-05-29.690 |