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.		2018-10-22 17:51:38 +02:00
..
accounts_cli.rb	Fix cull tripping on nil in last_webfingered_at (#9051)	2018-10-22 16:58:08 +02:00
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	2018-09-09 13:33:36 +02:00
emoji_cli.rb	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
feeds_cli.rb	Handle if username is not found on tootctl feeds build (#9040)	2018-10-21 16:42:22 +02:00
media_cli.rb	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
migration_helpers.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	2018-01-29 01:06:39 +01:00
redis_config.rb	Add support for separate Redis for cache (#7272)	2018-04-27 01:37:59 +02:00
settings_cli.rb	Add tootctl settings registrations open (#8829)	2018-10-04 16:05:54 +02:00
snowflake.rb	Fixes/do not override timestamps (#7336)	2018-05-03 23:02:46 +02:00
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00