Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
heavymery committed Sep 9, 2014
2 parents def0979 + b097610 commit 0ff91c9
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 2 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed dist/images/touch/apple-touch-icon.9b8350e0.png
Binary file not shown.
9 changes: 7 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<!DOCTYPE html><!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]--><!--[if IE 7]><html class="no-js lt-ie9 lt-ie8"><![endif]--><!--[if IE 8]><html class="no-js lt-ie9"><![endif]--><!--[if gt IE 8]><!--><html class="no-js"><!--<![endif]--><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>scaffold-website-app</title><meta name="description" content="Website & app scaffolding."><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no,minimal-ui"><link rel="apple-touch-icon-precomposed" sizes="144x144" href="images/touch/apple-touch-icon-144x144-precomposed.aa903f9b.png"><link rel="apple-touch-icon-precomposed" sizes="114x114" href="images/touch/apple-touch-icon-114x114-precomposed.2a836b56.png"><link rel="apple-touch-icon-precomposed" sizes="72x72" href="images/touch/apple-touch-icon-72x72-precomposed.86d35088.png"><link rel="apple-touch-icon-precomposed" href="images/touch/apple-touch-icon-57x57-precomposed.9b8350e0.png"><link rel="shortcut icon" href="images/touch/apple-touch-icon.9b8350e0.png"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="scaffold-website-app"><link rel="stylesheet" href="styles/main.7703e685.css"><script src="scripts/vendor/modernizr.d1e46096.js"></script></head><body><!--[if lt IE 7]><p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p><![endif]--><!--[if lt IE 9]><script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script><![endif]--><!--[if lt IE 10]><p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p><![endif]--><div id="main-container"><header id="header"><div class="container"><h1 class="logo">Website & app scaffolding.</h1></div></header><div id="content"><div class="container"><p>Add content here.</p></div></div><footer id="footer"><div class="container"><p class="copyright">© 2014 ...</p></div></footer></div><script src="scripts/vendor.db02b173.js"></script><script src="scripts/main.35b0700f.js"></script></body></html>
<!DOCTYPE html><!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]--><!--[if IE 7]><html class="no-js lt-ie9 lt-ie8"><![endif]--><!--[if IE 8]><html class="no-js lt-ie9"><![endif]--><!--[if gt IE 8]><!--><html class="no-js"><!--<![endif]--><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title>scaffold-website-app</title><meta name="description" content="Website & app scaffolding."><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no,minimal-ui"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="scaffold-website-app"><link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png"><link rel="stylesheet" href="styles/main.7703e685.css"><script src="scripts/vendor/modernizr.d1e46096.js"></script></head><body><!--[if lt IE 9]><script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script><![endif]--><!--[if lt IE 9]><p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p><![endif]--><div id="main-container"><header id="header"><div class="container"><h1 class="logo">Website & app scaffolding.</h1></div></header><div id="content"><div class="container"><p>Add content here.</p></div></div><footer id="footer"><div class="container"><p class="copyright">© 2014 ...</p></div></footer></div><script src="scripts/vendor.db02b173.js"></script><script src="scripts/main.35b0700f.js"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-XXXXX-X', 'auto');
ga('send', 'pageview');</script></body></html>

0 comments on commit 0ff91c9

Please sign in to comment.