| commit | 82fbcc0af8f46d640024dbb5f612d7b7f0552ec5 | [log] [tgz] |
|---|---|---|
| author | Mattias Jansson <mattias@rampantpixels.com> | Wed Jan 24 21:35:18 2018 +0100 |
| committer | Mattias Jansson <mattias@rampantpixels.com> | Wed Jan 24 21:35:18 2018 +0100 |
| tree | 55a03673f2ab523a50e2ece7ac1e2519804c1902 | |
| parent | 0f87f540aae5b8c5baca18ec1f71c9b2ea3a3ac3 [diff] | |
| parent | d69fb715b2f6ef5b05d1ee5a0461af923ca019fd [diff] |
Merge branch 'release/1.2.2'