diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
commit | b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3 (patch) | |
tree | 57247808f666c2dfe689f09f0b35a0d95d958e68 /version.inc | |
parent | fb1e6ca6c17dc24cfe29bde375f933822117a9af (diff) | |
parent | 75468c255a5fcb7d78a95e6c865d4d503efbfbfc (diff) | |
download | volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.gz volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.bz2 volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.zip |
Merge remote-tracking branch 'upstream/master'
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 f5b62614f..2e8e8f4ff 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-20.1284H +2016-01-21.1285H |