David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		2018-05-18 08:47:10 -05:00
..
actions	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	2018-05-18 02:32:35 +02:00
components
containers
features	Reword the direct message warning (#7420)	2018-05-16 14:47:11 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
middleware
reducers
selectors
service_worker
storage
store
utils	Fix images resized in browser getting cropped (#7514)	2018-05-16 16:24:16 +02:00
.gitkeep
api.js
base_polyfills.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
link_header.js
load_polyfills.js
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)	2018-05-18 02:32:35 +02:00
test_setup.js
uuid.js