middleman/middleman-core/lib/middleman-core/core_extensions
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
..
compass.rb Bring back extension block register syntax. Closes #1192 2014-03-25 11:00:43 -07:00
data.rb remove old style extension support 2014-01-01 15:10:49 -08:00
default_helpers.rb Merge middleman-more back into middleman-core 2014-03-03 22:32:12 -08:00
extensions.rb move sprockets init 2014-03-25 17:00:17 -07:00
external_helpers.rb Put template rendering in a jail 2014-01-02 16:05:39 -08:00
file_watcher.rb Merge branch 'v3-stable' 2014-03-25 22:35:19 -07:00
front_matter.rb remove confusing and broken data.page variable 2014-01-03 16:18:16 -08:00
i18n.rb Merge middleman-more back into middleman-core 2014-03-03 22:32:12 -08:00
rendering.rb remove Implied Extensions feature. Closes #1211 2014-03-20 17:12:41 -07:00
request.rb move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
routing.rb remove instance variable and page block support 2014-01-03 15:49:54 -08:00
show_exceptions.rb remove old style extension support 2014-01-01 15:10:49 -08:00