tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main' ... # Conflicts: # app/controllers/concerns/sign_in_token_authentication_concern.rb # app/javascript/mastodon/features/compose/components/action_bar.js # app/javascript/mastodon/features/compose/index.js		2022-05-10 10:17:24 +02:00
..
migrate	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
views	Fix some old migration scripts (#17394)	2022-01-31 10:31:36 +01:00
schema.rb	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00