Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 18:13:30 -05:00
parent 99b2bc2668 f6bb50b6ec
commit 5cff053944
62 changed files with 868 additions and 195 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,8 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 2018_06_04_000556) do

+ActiveRecord::Schema.define(version: 2018_06_09_104432) do
+  
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"