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)
Removed CfS from sidebar


Trivial merge