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)
commit535589255d57bd9251a82dd7b0eaa1c38f129058
tree25c626738253cfc4aee96c63a7844370ddfda2dc
parentbabc7538773c79cdef2294af28c594ae521d2aa6
parentb02ef0136c2610be5aa074f679adc6c60dae26bf
Merge branch 'master' into live
en/index.html