Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -15,6 +15,7 @@
 #  disabled           :boolean          default(FALSE), not null
 #  uri                :string
 #  image_remote_url   :string
+#  visible_in_picker  :boolean          default(TRUE), not null
 #

 class CustomEmoji < ApplicationRecord