You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/javascript/mastodon
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
components Change design of new list form in web UI (#19801) 2 years ago
containers
features Merge remote-tracking branch 'upstream/main' into develop 2 years ago
locales Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
middleware
reducers Merge remote-tracking branch 'upstream/main' into develop 2 years ago
selectors
service_worker
store
utils
api.js
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge remote-tracking branch 'upstream/main' into develop 2 years ago
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
permissions.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js