Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
associations.rb	Add support for emoji reactions	2023-12-29 12:33:13 -06: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-01-28 02:29:46 +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