Merge branch 'stable' into 2021-design
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 18 Mar 2021 17:29:08 +0000 (13:29 -0400)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 18 Mar 2021 17:29:08 +0000 (13:29 -0400)
commit32215bd81e7d16e209a280678fea77732a700be5
treeb3b5c30db73638667c071f84d9f5a7fc7898f0fd
parentdc5cb7d7a1f04894470002f04e13d45ace13be23
parenta50ac91144d56a93329b9decbfd5dadf9cc0c59e
Merge branch 'stable' into 2021-design

Merging stable branch into Michael's design branch