This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
migrate	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
schema.rb	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00