imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
account_moderation_notes	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
accounts	Display deleted users' role as “Suspended” (#6339)	2018-01-23 14:31:31 +01:00
action_logs	Add consumable invites (#5814)	2017-11-27 16:07:59 +01:00
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	2017-12-30 02:43:43 +01:00
domain_blocks
email_domain_blocks
instances
invites	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
reports	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
settings	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
statuses	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
subscriptions