middleman/middleman-templates/lib/middleman-templates
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
..
default/source move to middleman-templates 2014-03-11 11:07:55 +00:00
html5/source move to middleman-templates 2014-03-11 11:07:55 +00:00
mobile/source move to middleman-templates 2014-03-11 11:07:55 +00:00
shared Merge branch 'v3-stable' 2014-03-25 22:35:19 -07:00
default.rb rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00
empty.rb rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00
html5.rb rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00
local.rb Although equivalent, clearer for non-*nix based systems 2014-03-24 10:39:25 +00:00
mobile.rb rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00