Merge branch 'master' into stable
authorGeorgia Young <geographic@riseup.net>
Fri, 1 Dec 2017 18:05:17 +0000 (13:05 -0500)
committerGeorgia Young <geographic@riseup.net>
Fri, 1 Dec 2017 18:05:17 +0000 (13:05 -0500)
commit300bd81f54fcd9e48da4d9ed8ddfc5669f75a341
tree710dc8f531721ce87947d8829af30f65c5f5244a
parenta170d836d76455b59b1d30b8e3f3abba428c85ea
parent59ec301182345e3578a1811da86f3987a4d56ef3
Merge branch 'master' into stable