Commit Graph

2 Commits (df326b8b5c0659edb2aca77690a892f228b0e099)

Author SHA1 Message Date
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
6 years ago
Thibaut Girka 48db3b3c99 Tighten CSP while allowing CDN hosts 7 years ago