Merge branch 'update21' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Tue, 13 Jul 2021 20:52:07 +0000 (16:52 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Tue, 13 Jul 2021 20:52:07 +0000 (16:52 -0400)
commit9482abc5e94dabc706dd99fd88d820aada3db554
treeba1be763eb3a2a5f7ff9140f3bb6bc59bd2f017b
parentc02b6998b8df3a563262fd2c7785fdc29ee89fbf
parent0f9adb42278ac3049ec87f37782b871ff3bcfa32
Merge branch 'update21' into live

we went live with the update21 branch, and now we want to work on
changes in the live branch
en/index.html