Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
accounts	Remove unnecessary underline on accounts table (#7728)	2018-06-04 13:09:36 +02:00
action_logs	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
change_emails	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
custom_emojis	…
dashboard	Fix tag usage display on admin dashboard	2018-07-16 19:51:16 +02:00
domain_blocks	…
email_domain_blocks	…
instances	…
invites	…
relays	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_notes	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
settings	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
statuses	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
subscriptions	…