upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0

Conflicts:
	middleman-core/lib/middleman-core/application.rb
This commit is contained in:
Nico Hagenburger 2014-02-01 23:45:46 +01:00
parent cb87e70a72
commit 732532b72e
25 changed files with 804 additions and 367 deletions

View file

@ -14,7 +14,7 @@ require 'active_support/core_ext/integer/inflections'
require 'active_support/core_ext/float/rounding'
# Simple callback library
require 'vendored-middleman-deps/hooks-0.2.0/lib/hooks'
require 'vendored-middleman-deps/hooks-0.3.3/lib/hooks'
# Our custom logger
require 'middleman-core/logger'