Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		2020-01-12 15:57:34 +01:00
..
account_actions
account_moderation_notes
account_warnings
accounts	Add link to search for users connected from the same IP address (#12157)	2019-10-24 22:49:26 +02:00
action_logs
change_emails
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
dashboard
domain_allows
domain_blocks
email_domain_blocks	Use heading actions and placeholders in settings (#12801)	2020-01-11 02:14:45 +01:00
followers
instances	Link to reports targetting instance in admin view (#12513)	2019-12-01 19:03:43 +01:00
invites
pending_accounts
relays
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
settings	Fix issue because of theming system	2019-12-19 14:42:16 +01:00
statuses
tags	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
warning_presets