Merge branch 'master' of github.com:gskinner/regexr

gskinner · gskinner · commit 3e80d177633c · 2016-07-11T12:20:56.000-06:00
diff --git a/index.html b/index.html
@@ -188,7 +188,7 @@ <h1 class="tool-label"></h1>
 		<div class="measure"></div>
 		<canvas class="canvas" width="1" height="1"></canvas>
 		<textarea class="default">
-Welcome to RegExr v2.1 by gskinner.com!
+Welcome to RegExr v2.1 by gskinner.com, proudly hosted by Media Temple!
 
 Edit the Expression & Text to see matches. Roll over matches or the expression for details. Undo mistakes with {{ctrl}}-z. Save Favorites & Share expressions with friends or the Community. Explore your results with Tools. A full Reference & Help is available in the Library, or watch the video Tutorial.
 
@@ -200,6 +200,7 @@ <h1 class="tool-label"></h1>
 foo@demo.net	bar.ba@test.co.uk
 www.demo.com	http://foo.co.uk/
 http://regexr.com/foo.html?q=bar
+https://mediatemple.net
 		</textarea>
 	</div>
 
diff --git a/scss/third-party/compass-mixins/compass/_functions.scss b/scss/third-party/compass-mixins/compass/_functions.scss
@@ -1,4 +1,3 @@
-@import "functions/lists";
 @import "functions/cross_browser_support";
 @import "functions/gradient_support";
 @import "functions/constants";
diff --git a/scss/third-party/compass-mixins/compass/functions/_lists.scss b/scss/third-party/compass-mixins/compass/functions/_lists.scss

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import "functions/lists";`
`2`	`1`	`@import "functions/cross_browser_support";`
`3`	`2`	`@import "functions/gradient_support";`
`4`	`3`	`@import "functions/constants";`