Thomas Reynolds fac4928d50 Update haml and sass deps ... Conflicts: Gemfile middleman/middleman.gemspec		2014-04-03 10:01:18 -07:00
..
features	Update haml and sass deps	2014-04-03 10:01:18 -07:00
fixtures	Merge pull request #1238 from bhollis/asciidoc	2014-03-30 10:52:40 -07:00
lib	Add options hash to asset methods to allow special options to be passed through from extensions	2014-03-31 14:15:46 -07:00
spec	Move to flat_map now that we don't use 1.8	2013-11-18 22:22:18 -08:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
.simplecov	ignore vendor in simplecov	2013-06-04 14:28:46 -07:00
.yardopts	Move CLI into middleman-cli	2014-01-02 16:39:06 -08:00
middleman-core.gemspec	Update haml and sass deps	2014-04-03 10:01:18 -07:00
Rakefile	whitespace [ci skip]	2014-03-25 13:13:36 +00:00