Merge branch '3.6.0' into 4.0.0
authorRui Marinho <me@ruimarinho.net>
Thu, 23 May 2019 00:06:47 +0000 (01:06 +0100)
committerRui Marinho <me@ruimarinho.net>
Thu, 23 May 2019 00:06:47 +0000 (01:06 +0100)
commite4a683b88f15fca87e50318d8696f6421f18b346
tree72a3a8e31faba5d65136f7a3cecf9053c7c681b0
parentc626a3f2993c4a1daa4bf3f6d7069c64a5e653e2
parent016f305ce2345838afd94da435b74c45ef8ee350
Merge branch '3.6.0' into 4.0.0