deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
middleman/middleman-core
History
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
..
bin Stop messing with load path in middleman executable 2012-09-15 18:45:14 -07:00
features Merge remote-tracking branch 'origin/3.0-stable' 2013-01-25 21:43:30 -08:00
fixtures Merge remote-tracking branch 'origin/3.0-stable' 2013-01-25 21:43:30 -08:00
lib Merge remote-tracking branch 'origin/3.0-stable' 2013-02-10 15:41:36 -08:00
spec Add a spec for testing Middleman::Util#binary? 2013-02-09 15:49:10 -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-core.gemspec Merge remote-tracking branch 'origin/3.0-stable' 2013-02-10 15:41:36 -08:00
Rakefile The return of the windows gem, for wdm and speedier file watching support 2012-09-01 08:44:02 -07:00