Merge branch 'master' into stable
authorGeorgia Young <geographic@riseup.net>
Wed, 30 Nov 2016 20:27:40 +0000 (15:27 -0500)
committerGeorgia Young <geographic@riseup.net>
Wed, 30 Nov 2016 20:27:40 +0000 (15:27 -0500)
commitff51f88ea20abe0ea979f7eda935c00892af4785
tree2b7ee639e3e18789e21a5662378112a552948f0d
parentc2ac9b23bbd46a29f8718c8fc9d0e75a52bcfd86
parent1504a1e835fbd91b6f439f02ac5cbfc8efa536c4
Merge branch 'master' into stable

Removed CfS from sidebar