Jeremy Kescher 2df3b9f803 Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb		2024-04-11 21:50:48 +02:00
..
components	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
containers	Add ability to reorder uploaded media before posting in web UI (#28456)	2024-03-25 10:29:55 +00:00
util	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.jsx	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00