Thomas Reynolds
|
4b53549ae4
|
Merge in recent changes from v3-stable
|
2014-04-08 09:27:18 -07:00 |
|
Ben Hollis
|
32716f3729
|
Avoid loading middleman-core unless needed. Fixes #1203.
|
2014-03-13 20:27:41 -07:00 |
|
Ben Hollis
|
7b46fd6524
|
Merge remote-tracking branch 'origin/v3-stable'
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
|
2014-02-22 18:11:37 -08:00 |
|
Thomas Reynolds
|
c06fbcfc93
|
rely directly on rack-mock
|
2014-01-02 21:45:42 -08:00 |
|
Thomas Reynolds
|
bea2515a41
|
Move CLI into middleman-cli
|
2014-01-02 16:39:06 -08:00 |
|