Commit 6e55f8f4 authored by cazenave's avatar cazenave
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	nginx/default.conf
	public/config.js
parents 469dc8a7 0e8c68cf
......@@ -52,7 +52,7 @@ $container-small-max-width: 960px !default;
// Header
$header-height: 100px !default;
$header-logo-url: '/assets/logo.png' !default;
$header-logo-url: '/app/assets/logo.png' !default;
$header-logo-width: 150px !default;
$header-logo-height: 42px !default;
$header-logo-indent: 25px !default;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment