You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc		6 years ago
..
actions	…
components	…
containers	…
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	squashed identity proof updates (#10375)	6 years ago
selectors	…
service_worker	…
storage	…
store	…
utils	…
api.js	Do not set CSRF Token when no csrf header (#10383)	6 years ago
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	bug fix (WebPush does not work) (#6120)	7 years ago
performance.js	…
ready.js	…
rtl.js	Restore vanilla components	7 years ago
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…