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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
actions	Improvements to the single column layout (#10835)	6 years ago
components	Scroll to compose form when focus (#10970)	6 years ago
containers	Add confirm modal for unboosting toots (#10287)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	Fix “mark as sensitive” not being used in delete & redraft (#10980)	6 years ago
selectors	…
service_worker	…
storage	…
store	…
utils	…
api.js	…
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	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	Improve streaming server security (#10818)	6 years ago
test_setup.js	…
uuid.js	…