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
..
middleman	Implemented Rubocop	2013-12-28 00:47:39 +00:00
middleman-core	Merge branch 'v3-stable' into feature/chained_templates_partials	2014-07-31 13:00:19 +02:00
middleman-more	Attempt to allow i18n to override partial lookup. #1333	2014-07-24 11:11:27 -07:00
vendored-middleman-deps	Unvendor padrino	2014-04-04 10:22:34 -07:00
middleman-core.rb	rubocoping	2014-07-02 10:11:52 -07:00