Permalink
Browse files

Merge remote branch 'christianhellsten/master' into next

  • Loading branch information...
2 parents 9bb2066 + 68c69fb commit f8484570b720fe7a3d801c0f99f2b3da20bf1d63 @mojombo mojombo committed Jun 22, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/jekyll.rb
  2. +1 −1 test/test_configuration.rb
View
@@ -55,7 +55,7 @@ module Jekyll
'server' => false,
'server_port' => 4000,
- 'source' => '.',
+ 'source' => Dir.pwd,
'destination' => File.join('.', '_site'),
'plugins' => File.join('.', '_plugins'),
@@ -3,7 +3,7 @@
class TestConfiguration < Test::Unit::TestCase
context "loading configuration" do
setup do
- @path = './_config.yml'
+ @path = File.join(Dir.pwd, '_config.yml')
end
should "fire warning with no _config.yml" do

0 comments on commit f848457

Please sign in to comment.