60f712e6ba
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 |
||
---|---|---|
.. | ||
middleman-templates | ||
middleman-templates.rb |