You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka dcded13a99 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.		6 years ago
..
actions	Add unread indicator to conversations (#9009)	6 years ago
components	RTL: remove blank character inside bdi (#9038)	6 years ago
containers	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	Add unread indicator to conversations (#9009)	6 years ago
selectors	…
service_worker	Fix a problem about generating an url of notifications (#8758)	6 years ago
storage	…
store	…
utils	…
api.js	…
base_polyfills.js	…
common.js	Revert Font Awesome 5 upgrade (#8810)	6 years ago
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	…