You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
account_moderation_notes	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
accounts	Feature: add count of account notes to reports (#7130)	7 years ago
action_logs	Add consumable invites (#5814)	7 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	7 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks	…
email_domain_blocks	Fix style of email domain block table (#5218)	7 years ago
instances	…
invites	Add invite filter (#5862)	7 years ago
report_notes	Feature: Improve reports ui (#7032)	7 years ago
reports	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
settings	Redesign landing page (again) (#6486)	7 years ago
statuses	Finalized theme loading and stuff	7 years ago
subscriptions	…