Merge branch 'master' into resize
authorTimo Korvola <tkorvola@iki.fi>
Sat, 10 Feb 2018 12:57:04 +0000 (14:57 +0200)
committerTimo Korvola <tkorvola@iki.fi>
Sat, 10 Feb 2018 12:57:04 +0000 (14:57 +0200)
commit18597db3b0d2f0ac66066f988d62433839de502b
tree335cd3a2b25cd7764a82ed395df62c0c7913a363
parent70f7f55ef43a13eace39e2f59c23f11fb1ed3880
parent2717adbd1d182b6139dfa2f41f69f38ea7ab8c42
Merge branch 'master' into resize