David Yip d9800a5647 Merge branch 'gs-master' into glitch-theme		2017-12-04 11:07:01 -06:00
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
base_controller.rb	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
confirmations_controller.rb	…
custom_emojis_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	Add consumable invites (#5814)	2017-11-27 16:07:59 +01:00
silences_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
suspensions_controller.rb	…
two_factor_authentications_controller.rb	…