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		2024-03-14 20:01:30 +01:00
..
associations.rb	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
avatar.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
counters.rb	Add explicit dependent: nil to associations (#28169)	2023-12-01 15:52:47 +00:00
finder_concern.rb	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
header.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
interactions.rb	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
merging.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
search.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
statuses_search.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00