7b46fd6524
Conflicts: CHANGELOG.md middleman-core/lib/middleman-core/core_extensions/rendering.rb middleman-core/lib/middleman-core/extensions.rb middleman-core/lib/middleman-core/version.rb middleman-core/lib/middleman-more/core_extensions/compass.rb middleman-core/lib/middleman-more/core_extensions/default_helpers.rb middleman-core/middleman-core.gemspec |
||
---|---|---|
.. | ||
bin | ||
features | ||
fixtures | ||
lib | ||
spec | ||
.gemtest | ||
.simplecov | ||
.yardopts | ||
middleman-cli.gemspec | ||
Rakefile |