Merge branch 'master' into clostridium

* master:
  Fix broken strain reference
  Rich text species and strains
  Add in quill WYSIWYG
This commit is contained in:
Matthew Dillon 2015-07-20 12:23:17 -08:00
commit 765bc45ce7
11 changed files with 62 additions and 9 deletions

View file

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