4 commits

Author	SHA1	Message	Date
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
Karl Freeman	ad14766278	Although equivalent, clearer for non-*nix based systems	2014-03-24 10:39:25 +00:00
Karl Freeman	8e8ddbc301	rejig templates, deprecate 'empty' template and rubocop them	2014-03-15 13:32:11 +00:00
Karl Freeman	772de85ce3	move to middleman-templates	2014-03-11 11:07:55 +00:00