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.

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		5 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
schema.rb	Merge branch 'master' into glitch-soc/master	5 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago