Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

2021-04-22 16:37:11 -07:00
parent b43c50afa8 799bf57e68
commit 4fe7cfc4be
126 changed files with 2708 additions and 366 deletions
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@ -77,7 +77,7 @@
      %h4= t 'admin.dashboard.software'
      %ul
        %li
-          Mastodon
+          Hometown
          %span.pull-right= @version
        %li
          Ruby