diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 19:51:57 +0100 |
commit | 90187eae37ecdee56d245f563f529638ea8f55da (patch) | |
tree | 5f06f71871ab8df3281b50c5d3c36d640498c672 /version.inc | |
parent | 3b7b3ef2bb8dce373d2184309958e790a0478371 (diff) | |
parent | 7399f7a087b56e2f09419dc8ff99fc5ce15fa195 (diff) | |
download | volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.gz volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.tar.bz2 volse-hubzilla-90187eae37ecdee56d245f563f529638ea8f55da.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 d6100d73a..05ca8c657 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-19.1221 +2015-11-20.1222 |