Merge pull request #229 from glitch-soc/glitch-theme

Advanced Next-Level Flavours And Skins For Mastodon™
This commit is contained in:
beatrix
2017-12-06 17:44:07 -05:00
committed by GitHub
387 changed files with 2930 additions and 936 deletions

View File

@@ -76,7 +76,7 @@ class User < ApplicationRecord
has_many :session_activations, dependent: :destroy
delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :theme,
:reduce_motion, :system_font_ui, :noindex, :flavour, :skin,
to: :settings, prefix: :setting, allow_nil: false
attr_accessor :invite_code