Fix bad merge from v3-stable

feature/livereload-locales-data
Thomas Reynolds 2015-05-04 10:02:32 -07:00
parent ee0f9f00f5
commit cee53d0f2d
1 changed files with 3 additions and 3 deletions

View File

@ -131,10 +131,10 @@ module Middleman
@host = app.config[:host]
@port = app.config[:port]
@https = @app.config[:https]
@https = app.config[:https]
@ssl_certificate = @app.config[:ssl_certificate]
@ssl_private_key = @app.config[:ssl_private_key]
@ssl_certificate = app.config[:ssl_certificate]
@ssl_private_key = app.config[:ssl_private_key]
app.files.on_change :reload do
$mm_reload = true