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

2020-05-13 22:11:49 +02:00
parent 559214c33f 92f85bea52
commit 3baacf6993
28 changed files with 695 additions and 813 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 2020_05_08_212852) do
+ActiveRecord::Schema.define(version: 2020_05_10_110808) do

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"