diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-07 00:02:40 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-07 00:02:40 +0100 |
| commit | bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (patch) | |
| tree | 19198a800f4eb67f7abdd2db273e4d52469faf4f /version.inc | |
| parent | 1f82beb2ef4b04d8da8dca4485c9dd64aa86d86b (diff) | |
| parent | 761afd029d97703f2f7609d546b7b5f3d257c601 (diff) | |
| download | volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.gz volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.bz2 volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.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 8a363fc45..be2d3de4a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-04.1268H +2016-01-06.1270H |