Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
account_container.js	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
admin_component.js	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +02:00
compose_container.js	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
domain_container.js	[Glitch] Change the string "hidden" to "blocked" in WebUI	2020-03-22 16:29:51 +01:00
dropdown_menu_container.js	Move more modules from flavours/glitch/utils to flavours/glitch	2022-10-11 12:25:45 +02:00
intersection_observer_article_container.js	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
mastodon.js	[Glitch] Fix wasteful request to /api/v1/custom_emojis when not logged in	2022-12-15 20:46:21 +01:00
media_container.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
notification_purge_buttons_container.js	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
poll_container.js	[Glitch] Fix not being able to vote	2020-04-17 22:04:10 +02:00
scroll_container.js	Please CodeClimate	2021-07-13 13:49:40 +02:00
status_container.js	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00