Merge remote-tracking branch 'origin/web/delete-forum'
commitfc5f36796381003fc944f470a2432055ee2b1a06
authorTails developers <amnesia@boum.org>
Wed, 5 Nov 2014 14:05:55 +0000 (5 14:05 +0000)
committerTails developers <amnesia@boum.org>
Wed, 5 Nov 2014 14:05:55 +0000 (5 14:05 +0000)
treec8e822ab42894ad7ec0b02009312b615b5948058
parentcdb44f43dc2186bf571c5e2ca9cbc92fcbb237cf
parenta13a467b0e4bad36f37fbc57db5b08529a6350e8
Merge remote-tracking branch 'origin/web/delete-forum'