Merge pull request #396 from Shopify/new-settings

Replace settings.html with settings_schema.json
Shopify · Apr 20, 2015 · 4eb9e08 · 4eb9e08
2 parents 196cb32 + 6df58db
commit 4eb9e08
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 224 deletions.
diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid
@@ -1,5 +1,5 @@
 /*============================================================================
-  Shopify Timber v2.1.0
+  Shopify Timber
   Copyright 2015 Shopify Inc.
   Author Carson Shold @cshold
   Built with Sass - http://sass-lang.com/

diff --git a/config/settings.html b/config/settings.html