Merge branch 'master' into clostridium

* master:
  Inline images in CSP
  Strains form formatting
  Clean up delete button and tests
  Lint
This commit is contained in:
Matthew Dillon 2015-11-16 10:55:10 -07:00
commit 09650e0f1b
10 changed files with 94 additions and 18 deletions

View file

@ -29,7 +29,7 @@ module.exports = function(environment) {
'script-src': "'self'",
'font-src': "'self'",
'connect-src': "'self'",
'img-src': "'self'",
'img-src': "'self' data:",
'style-src': "'self' 'unsafe-inline'",
'media-src': "'self'"
}