Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
actions	Improvements to the single column layout (#10835)	2019-05-26 02:55:37 +02:00
components	Scroll to compose form when focus (#10970)	2019-06-05 15:29:45 +02:00
containers	Add confirm modal for unboosting toots (#10287)	2019-05-09 22:39:26 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
locales	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-04 20:40:19 +02:00
middleware
reducers	Fix “mark as sensitive” not being used in delete & redraft (#10980)	2019-06-06 13:04:34 +02:00
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	2019-05-26 15:41:40 +02:00
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)	2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js