Merge branch 'master' into live
authorMolly de Blanc <molly@fsf.org>
Thu, 24 May 2018 15:38:14 +0000 (11:38 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 24 May 2018 15:38:14 +0000 (11:38 -0400)
commit83372ac29fb63881050510f3e10103b4b198d881
treecebf17e0a51c8ef6628a6870d8f8529fd856a9fd
parent535589255d57bd9251a82dd7b0eaa1c38f129058
parent97a73afe574bc67c39659596b398bb462873c21b
Merge branch 'master' into live
en/index.html