Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
actions	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	2019-09-29 21:46:05 +02:00
components	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00
containers	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	2019-09-29 21:46:05 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
middleware	…
reducers	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	2019-09-29 21:46:05 +02:00
selectors	…
service_worker	…
storage	…
store	…
utils	Do not add margin light when opening modal on mobile (#11830)	2019-09-29 14:30:58 +02:00
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	…
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	Exclude URLs from text analysis (#11759)	2019-09-04 22:30:49 +02:00
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…