Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
actions	Apply filters to poll options (#11174)	2019-06-25 14:45:14 +02:00
components	Add option to disable blurhash previews (#11188)	2019-06-26 19:33:04 +02:00
containers	…
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
middleware	…
reducers	Fix “mark as sensitive” not being used in delete & redraft (#10980)	2019-06-06 13:04:34 +02:00
selectors	Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)	2019-06-18 18:23:08 +02:00
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-06-26 23:19:22 +02:00
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…