Permalink
Browse files

Rebase on master

  • Loading branch information...
parkr committed Mar 16, 2013
1 parent b49bba9 commit 9a222b1519ed5df1ecb8749f8d406f06950e88b6
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/jekyll.rb
View
@@ -130,7 +130,7 @@ def self.configuration(override)
source = override['source'] || Jekyll::DEFAULTS['source']
# Get configuration from <source>/_config.yml
- config_file = File.join(source, '_config.yml')
+ config_file = override['config'] || File.join(source, '_config.yml')
begin
config = YAML.safe_load_file(config_file)
raise "Configuration file: (INVALID) #{config_file}" if !config.is_a?(Hash)

0 comments on commit 9a222b1

Please sign in to comment.