Jeremy Kescher fae98d1deb Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js		2024-05-20 23:57:04 +02:00
..
migrate	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
post_migrate	Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream	2024-05-20 17:47:48 +02:00
seeds	Fix development environment admin account not being auto-approved (#29958)	2024-04-16 17:30:32 +00:00
views	Change follow recommendation materialized view to be faster in most cases (#26545)	2023-08-18 18:20:55 +02:00
schema.rb	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-14 18:56:01 +02:00
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00