Merge branch 'master' into live
authorMolly de Blanc <molly@fsf.org>
Thu, 24 May 2018 15:28:56 +0000 (11:28 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 24 May 2018 15:28:56 +0000 (11:28 -0400)
1  2 
en/index.html

diff --cc en/index.html
Simple merge