Merge branches 'gh-pages' and 'gh-pages' of https://github.com/danielkummer/git-flow-cheatsheet into gh-pages

# Conflicts:
#	index.ca_CA.html
#	index.de_DE.html
#	index.el_GR.html
#	index.es_ES.html
#	index.fr_FR.html
#	index.hr_HR.html
#	index.html
#	index.it_IT.html
#	index.ja_JP.html
#	index.ko_KR.html
#	index.nl_NL.html
#	index.pl_PL.html
#	index.pt_BR.html
#	index.ro_RO.html
#	index.ru_RU.html
#	index.tr_TR.html
#	index.uk_UA.html
#	index.vi_VN.html
#	index.zh_CN.html
#	index.zh_TW.html
This commit is contained in:
Daniel Kummer
2017-03-31 19:53:08 +02:00
25 changed files with 1431 additions and 544 deletions

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>ściągawka do git-flow</title>
<link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
<style>
@ -12,7 +12,6 @@
font-family: 'Lobster';
}
</style>
<script src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript">
@ -67,9 +66,10 @@
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> -
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
<a href="#" class="active" title="Polish">Polski</a> -
<a href="#" class="active" title="Polish">Polski</a> -
<a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
</p>
</header>
@ -405,7 +405,7 @@
var dsq = document.createElement('script');
dsq.type = 'text/javascript';
dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>