middleman/middleman-templates/lib
Ben Hollis 60f712e6ba Merge branch 'v3-stable'
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
..
middleman-templates Merge branch 'v3-stable' 2014-03-25 22:35:19 -07:00
middleman-templates.rb don't load local templates if no HOME is set 2014-03-25 08:21:53 +00:00