Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		2018-10-22 17:51:38 +02:00
..
actions	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
components	RTL: remove blank character inside bdi (#9038)	2018-10-22 01:04:32 +02:00
containers	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)	2018-10-05 18:44:44 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
middleware
reducers	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
selectors
service_worker	Fix a problem about generating an url of notifications (#8758)	2018-09-24 05:45:58 +02:00
storage
store
utils
api.js
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	2018-10-22 17:51:38 +02:00
is_mobile.js
link_header.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js