Fix merge conflict in bootstrap.
authorMichael McMahon <michael@fsf.org>
Fri, 18 Mar 2022 23:08:35 +0000 (19:08 -0400)
committerMichael McMahon <michael@fsf.org>
Fri, 18 Mar 2022 23:08:35 +0000 (19:08 -0400)
commit46c77ffd33f70b509f3e65b826ba2f3e94b8ab3a
tree9ce71025b757242e3580412fda3a7ee3562a9d86
parent76478c30b3d5c272ef8c8b178212cc67f6efb9e0
Fix merge conflict in bootstrap.
2020/assets/css/bootstrap.min.css
2021/assets/css/bootstrap.min.css
2022/assets/css/bootstrap.min.css