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 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss		7 years ago
..
actions	Introduce flat layout to contexts reducer (#7150)	7 years ago
components	Use real container width in MediaGallery srcSet (#7571)	7 years ago
containers	Open video modal on public UI (#7469)	7 years ago
features	Introduce flat layout to contexts reducer (#7150)	7 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
middleware	…
reducers	Introduce flat layout to contexts reducer (#7150)	7 years ago
selectors	…
service_worker	Unescape HTML entities in rich web push notifications in web UI (#7569)	7 years ago
storage	Cache media only when storage can be freed (#7547)	7 years ago
store	…
utils	Fix images resized in browser getting cropped (#7514)	7 years ago
.gitkeep	…
api.js	…
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
compare_id.js	Fix comparing id (#7180)	7 years ago
extra_polyfills.js	…
initial_state.js	…
is_mobile.js	…
link_header.js	…
load_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
test_setup.js	…
uuid.js	…