lib/octopress/configuration.rb in octopress-3.0.0.alpha7 vs lib/octopress/configuration.rb in octopress-3.0.0.alpha8

@@ -10,10 +10,10 @@
     }
 
     def self.config(options={})
       return @config if @config
 
-      file = '_octopress.yml'
+      file = options['octopress-config'] || '_octopress.yml'
       config = {}
       if File.exist? file
         config = YAML.safe_load(File.open(file))
       end
       @config = DEFAULTS.deep_merge(config)