mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-03 12:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/flavours/glitch/features/status
History
Jeremy Kescher 7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/models/notification.rb
#	config/locales/simple_form.de.yml
2023-03-05 12:34:16 +01:00
..
components Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00
containers Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
index.jsx Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00