Commit 12d8f227 authored by Jochen Kressin's avatar Jochen Kressin
Browse files

Merge branch '7.x' into 7.x-36

parents d388c1d8 471cd25c
......@@ -41,11 +41,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Favicon -->
<link rel="apple-touch-icon" href="" />
<link rel="apple-touch-icon" href="" sizes="114x114" />
<link rel="apple-touch-icon" href="" sizes="72x72" />
<link rel="icon" href="" sizes="32x32" />
<link rel="icon" href="" sizes="144x144" />
<link rel="apple-touch-icon" href="img/logos/SG_Fav-57px.png" />
<link rel="apple-touch-icon" href="img/logos/SG_Fav-114px.png" sizes="114x114" />
<link rel="apple-touch-icon" href="img/logos/SG_Fav-172px.png" sizes="72x72" />
<link rel="icon" href="img/logos/SG_Fav-32px.png" sizes="32x32" />
<link rel="icon" href="img/logos/SG_Fav-144px.png" sizes="144x144" />
<link rel="canonical" href="{{site.baseurl}}{{page.url}}">
......@@ -5,7 +5,7 @@ rm -rf ./_site
bundle install
bundle exec jekyll build --config _config.yml,_versions.yml
ncftpput -R -v -u $ftp_username -p $ftp_password /7.x-36 ./_site/*
ncftpput -R -v -u $ftp_username -p $ftp_password /7.x-36 ./_site/*
export GIT_COMMIT_DESC=$(git log --format=oneline -n 1 $CIRCLE_SHA1)
Supports Markdown
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