diff options
| author | Malf Furious <m@lfurio.us> | 2015-12-18 23:18:33 -0500 | 
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2015-12-18 23:18:33 -0500 | 
| commit | 9068e6916ad68194fce2518ab5841af1c8949f3d (patch) | |
| tree | 2f91e9e3be00c1492cdf4ce88d8e77a909c5c287 /examples | |
| parent | 2ebdbaa48f10d6a6f5a1b78f4ef2c5433e50c8cf (diff) | |
| parent | b21251ef971d262dc414869fed83f52d0098bfe6 (diff) | |
| download | scrott-9068e6916ad68194fce2518ab5841af1c8949f3d.tar.gz scrott-9068e6916ad68194fce2518ab5841af1c8949f3d.zip | |
Merge branch 'framework' into dev
Diffstat (limited to '')
| -rw-r--r-- | examples/example.html (renamed from app/index.html) | 9 | 
1 files changed, 0 insertions, 9 deletions
| diff --git a/app/index.html b/examples/example.html index 15b8602..44c91f2 100644 --- a/app/index.html +++ b/examples/example.html @@ -2,14 +2,8 @@  <html lang="en">      <head> -        <meta charset="utf-8" /> -        <meta http-equiv="X-UA-Compatible" content="IE=edge" /> -        <meta name="viewport" content="width=device-width, initial-scale=1" /> -          <title>Scrott - Save the World</title> -        <link rel="stylesheet" type="text/css" href="assets/css/bootstrap.min.css" /> -          <style type="text/css">  body  { @@ -223,8 +217,5 @@ body              </div>          </div> -        <!-- JS --> -        <script type="text/javascript" src="assets/js/jquery.min.js"></script> -        <script type="text/javascript" src="assets/js/bootstrap.min.js"></script>      </body>  </html> | 
