You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
catstodon/db
Jeremy Kescher caccc2e0f4
Merge branch 'glitch-soc' into develop
# Conflicts:
#	README.md
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/reducers/compose.js
#	app/javascript/flavours/glitch/styles/components.scss
#	app/javascript/mastodon/reducers/compose.js
#	app/models/notification.rb
2 weeks ago
..
migrate Merge branch 'glitch-soc' into develop 2 weeks ago
post_migrate Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 1 month ago
seeds Move "everyone" role and "instance actor" account magic number IDs to constants (#29260) 1 month ago
views Change follow recommendation materialized view to be faster in most cases (#26545) 7 months ago
schema.rb Merge branch 'glitch-soc' into develop 2 weeks ago
seeds.rb Drop EOL Ruby 2.7 (#24237) 11 months ago