Dennis Günnewig 98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials ... Conflicts: middleman-core/lib/middleman-core/core_extensions/rendering.rb		2014-07-31 13:00:19 +02:00
..
bin	Stop messing with load path in middleman executable	2012-09-15 18:45:14 -07:00
features	Merge branch 'v3-stable' into feature/chained_templates_partials	2014-07-31 13:00:19 +02:00
fixtures	Merge branch 'v3-stable' into feature/chained_templates_partials	2014-07-31 13:00:19 +02:00
lib	Merge branch 'v3-stable' into feature/chained_templates_partials	2014-07-31 13:00:19 +02:00
spec	fix specs on windows	2014-07-03 21:09:32 +01: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	Fix yard options	2013-11-25 00:12:39 -08:00
middleman-core.gemspec	Update listen gem	2014-07-02 12:57:01 +01:00
Rakefile	Implemented Rubocop	2013-12-28 00:47:39 +00:00