projects / gruntmaster-page.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 761d945 6de06ca)
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 23 Feb 2015 14:39:04 +0000 (16:39 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 23 Feb 2015 14:39:04 +0000 (16:39 +0200)
Conflicts:
tmpl/skel.en

1  2 
tmpl/skel.en patch | diff1 | diff2 | blob | history

diff --cc tmpl/skel.en
index df7409230457906d26da8f4d499b85355cf6d6aa,de00cd827b89337dc0123bf3285ab537596769b4..c28e1f761603f7cbb6e1fa7aa154862e9d7156e1
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -3,8 -3,8 +3,8 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
 -<link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
 -<script src="/js.js" type="text/javascript" async defer></script>
 +<link rel="stylesheet" href="https://static.mindcoding.ro/css/slate.css" id="stylesheet">
- <script src="https://static.mindcoding.ro/js.js" type="text/javascript"></script>
++<script src="https://static.mindcoding.ro/js.js" type="text/javascript" async defer></script>
  
  <body>
  <nav role="navigation">
Gruntmaster page generators
This page took 0.011054 seconds and 4 git commands to generate.