deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
middleman/middleman-core
History
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00
..
features Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
fixtures Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
lib Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08: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 Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
Rakefile Implemented Rubocop 2013-12-28 00:47:39 +00:00