Commit Graph

2 Commits (f17a61a91686c79ebacf3fad8bd934ac3a563dd0)

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.
2018-10-05 15:23:57 +02:00
Thibaut Girka 48db3b3c99 Tighten CSP while allowing CDN hosts 2018-08-23 22:58:40 +02:00