diff options
| author | zottel <github@zottel.net> | 2014-02-28 08:16:56 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-28 08:16:56 +0100 |
| commit | 4bb8e294a10a11d964759026bb1e899ca3926984 (patch) | |
| tree | 48fec5a7c0af5bc929f94223a7175aa9b484de69 /version.inc | |
| parent | f8b3f032a95ccc9b1730a532e7b9fe185f7db910 (diff) | |
| parent | 7cb295bbe627eab2546e859248eacd26da948ed9 (diff) | |
| download | volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.tar.gz volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.tar.bz2 volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/help.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 ecdc97e53..cc429ef06 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-26.600 +2014-02-27.601 |