Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
actions	Immediately go back in browser history upon successfully sending toot (#9663)	2018-12-30 18:58:25 +01:00
components	Change the icon to "reply-all" when reply to other accounts (#9378)	2018-12-28 03:51:32 +01:00
containers	Upgrade ESLint to v5.x (#9694)	2019-01-02 07:28:53 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
middleware
reducers	Fix crash when clearing uninitialized timeline (#9662)	2018-12-30 18:57:39 +01:00
selectors	Don't filter own toots (fixes #8289) (#8298)	2018-08-19 18:44:18 +02:00
service_worker	Fix a problem about generating an url of notifications (#8758)	2018-09-24 05:45:58 +02:00
storage
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils
api.js	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
base_polyfills.js
common.js	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01: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