diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-09 18:47:52 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-09 18:47:52 +0100 |
commit | 41057ac3642ea8c7126cc980be5d896b8b6ff7c3 (patch) | |
tree | 4ab491a65da69c4deb81693f899b9550f5bee010 /version.inc | |
parent | bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (diff) | |
parent | 1c982315dd2d1886432eaece7c7ccb8d385640ae (diff) | |
download | volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.gz volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.bz2 volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.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 be2d3de4a..9846c0954 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-06.1270H +2016-01-07.1271H |