Merge branch 'release/1.0.1'

warmshowers · Sep 14, 2016 · 1acf462 · 1acf462
2 parents cec1349 + f212613
commit 1acf462
Show file tree

Hide file tree

Showing 3 changed files with 9,900 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,10 +14,6 @@ ubercart_encryption/uc_credit.key
 private_files
 .floo*
 
-# Ignore CSS generated by compass
-# @TODO Andrew: I think we need to check this in because we don't want to run compass on prod.
-docroot/sites/all/themes/warmshowers_zen/css/styles.css
-docroot/sites/all/themes/warmshowers_zen/css/styles-rtl.css
 *.sass-cache
 
 # Ignore the robots.txt this is now handled in the CMS by the robotstxt module.