aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Longair <mhl@pobox.com>2013-11-11 14:30:50 +0000
committerMark Longair <mhl@pobox.com>2013-11-19 17:31:37 +0000
commitb65b0e947184aa563d3f70262c14a66f1b8b9668 (patch)
treead14baf5859e39bb5087a038b8d3b4b5cb6ea00c
parent5db2c779feef1252c61e761e47a0a4029d0538c1 (diff)
Include both the main and custom CSS files
-rw-r--r--app/assets/stylesheets/application.css2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 9f66182a9..207e3e980 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,3 +1,5 @@
/* ...
*= require_self
+*= require main
+*= require custom
*/