Thibaut Girka 82e197787f 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
..
_action_log.html.haml	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
_status.html.haml	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
index.html.haml	Avoid using pluralize on moderation pages (#12589)	2019-12-12 19:50:23 +01:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00