diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-11 06:38:24 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-11 06:38:24 +0100 |
commit | 42433c0b4442f1a6b451324fe7f765b1b4c354b8 (patch) | |
tree | 27d3c56df94363c5b9dad0f0ccddea9ddf7a06b2 /version.inc | |
parent | 41057ac3642ea8c7126cc980be5d896b8b6ff7c3 (diff) | |
parent | f4d47f825df40095f5b66b039dc6ca2d689e6b16 (diff) | |
download | volse-hubzilla-42433c0b4442f1a6b451324fe7f765b1b4c354b8.tar.gz volse-hubzilla-42433c0b4442f1a6b451324fe7f765b1b4c354b8.tar.bz2 volse-hubzilla-42433c0b4442f1a6b451324fe7f765b1b4c354b8.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 9846c0954..3641bf5e9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-07.1271H +2016-01-10.1274H |