3781: Merge branch 'master' into 3781-browser-upload

[arvados.git] / apps / workbench / app / assets / stylesheets / application.css.scss

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 8b5580fc38eb7a2a3cc9deb0afcdc67b399ecee6..e814832364c670749d4cb8581ffc9c42cdb352a0 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -11,6 +11,7 @@
  *= require_self
  *= require bootstrap
  *= require bootstrap3-editable/bootstrap-editable
+ *= require morris
  *= require_tree .
  */