Merge branch 'main' into glitch-soc/merge-upstream

2022-06-10 11:51:43 +02:00
parent 3d841eba69 a2871cd747
commit edaaf6a5e9
156 changed files with 1768 additions and 156 deletions
--- a/app/models/admin/action_log.rb
+++ b/app/models/admin/action_log.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: admin_action_logs