Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Fri, 9 Mar 2018 18:01:32 +0000 (13:01 -0500)
committerMolly de Blanc <molly@fsf.org>
Fri, 9 Mar 2018 18:01:32 +0000 (13:01 -0500)
1  2 
2018/includes/generated-bios.html

Simple merge