Commit Graph

2 Commits (bee8c9112fa90324a0decd2e25417f74eb5eb7ca)

Author SHA1 Message Date
Thibaut Girka f627ea99e4 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.
2018-10-05 15:23:57 +02:00
Thibaut Girka 91c50b0d4b Tighten CSP while allowing CDN hosts 2018-08-23 22:58:40 +02:00