Merge branch 'master' into mistletoe

This commit is contained in:
kek7198 2021-12-10 11:17:34 -06:00
commit 0921ef01d2
22 changed files with 241 additions and 416 deletions

View file

@ -1,5 +1,5 @@
<script src="/assets/js/ban_modal.js?v=1"></script>
<script src="/assets/js/ban_modal.js?v=2"></script>
<div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">