Ben Hollis 4745418200 Merge remote-tracking branch 'origin/3.0-stable' ... Conflicts: .travis.yml Gemfile middleman-core/lib/middleman-core/version.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-core/middleman-core.gemspec		2013-03-02 22:32:03 -08:00
..
coffee_script.rb	Support Haml 4. Tests only run with Haml 4 now. Fixes #783	2013-02-17 19:40:17 -08:00
erb.rb	Switch over to new config methods	2012-10-13 21:37:02 -07:00
haml.rb	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
less.rb	Move more things over to new configs. Don't let root be configured	2012-10-13 22:37:24 -07:00
liquid.rb	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
markdown.rb	Switch over to new config methods	2012-10-13 21:37:02 -07:00
redcarpet.rb	Fix for embedded Markdown in Slim w/ Redcarpet	2012-12-15 14:52:15 -08:00
sass.rb	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-25 21:43:30 -08:00
slim.rb	Fix for embedded Markdown in Slim w/ Redcarpet	2012-12-15 14:52:15 -08:00
stylus.rb	Stylus support and tests. Fixes #649	2012-10-28 12:19:47 -07:00