diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-19 06:36:06 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-19 06:36:06 +0100 |
commit | cd49ec92e38044c0707e91500ec482b26ae7f166 (patch) | |
tree | 15aaf6cba0d52be3e7d26e9197d64ba94c9b3751 /version.inc | |
parent | 7b4cfffc03ddb68617fd71479866f3bf4f106768 (diff) | |
parent | ee39e3cf7268b260ac12d0dd8157a47fdd579ff0 (diff) | |
download | volse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.tar.gz volse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.tar.bz2 volse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.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 a1de68ee0..369ed3cb7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-18.1220 +2015-11-18.1221 |