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
..
_custom_emoji.html.haml	Fix not showing if emoji has a local counterpart in admin UI (#12135)	2019-10-10 02:21:52 +02:00
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
new.html.haml	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00