| commit | f3b2e630871c32288e7b501877c6d99d20171c20 | [log] [tgz] |
|---|---|---|
| author | Mattias Jansson <mattias@rampantpixels.com> | Tue Jun 20 08:00:45 2017 +0200 |
| committer | Mattias Jansson <mattias@rampantpixels.com> | Tue Jun 20 08:00:45 2017 +0200 |
| tree | 784d5f9545d3cdf1fc7e7b5f098a98e74bef61c3 | |
| parent | affb73da8f94b4dbdf05803dbcd5accec9e8a1ba [diff] | |
| parent | 8bb77f2cf3b6fd4837ddd3fe346498f1af9906a3 [diff] |
Merge branch 'release/1.2'