updated for merge conflicts.
authorMolly de Blanc <molly@fsf.org>
Tue, 4 Sep 2018 21:20:13 +0000 (17:20 -0400)
committerMolly de Blanc <molly@fsf.org>
Tue, 4 Sep 2018 21:20:13 +0000 (17:20 -0400)
commit9e20778d9ae3426952c23941cbca65cb8b4a5c0e
tree54ba55df67f708701ea3cdffc7a4a633bb7a6fbb
parent85bb509670efcd46964c749c4be5a710f5431c91
parenta5170bd88c107d0a503d70bf952f729b98000aee
updated for merge conflicts.
2019/includes/banner.html
2019/includes/home-content.html
2019/sponsors/index.html