Ben Hollis 52c4677391 Merge remote-tracking branch 'origin/3.0-stable' ... Conflicts: middleman-core/lib/middleman-core/core_extensions/data.rb middleman-core/lib/middleman-core/core_extensions/front_matter.rb middleman-core/lib/middleman-core/util.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-more/lib/middleman-more/core_extensions/default_helpers.rb middleman-more/lib/middleman-more/core_extensions/i18n.rb		2013-02-10 15:41:36 -08:00
..
features	Merge remote-tracking branch 'origin/3.0-stable'	2013-02-10 15:41:36 -08:00
fixtures	also "build" .htpasswd files	2013-01-21 11:21:48 -08:00
lib	Merge remote-tracking branch 'origin/3.0-stable'	2013-02-10 15:41:36 -08:00
spec	Stub out rspec tests for public APIs: Rack and Sitemap for now	2013-02-09 15:32:32 -08:00
.cane	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
.cane-exclusions.yml	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
middleman-more.gemspec	Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs.	2013-01-25 22:31:40 -08:00
Rakefile	setup rakefile for windows build	2012-01-05 20:34:24 -08:00