Merge branch 'master' into modifycdn

2017-09-03 15:37:45 +08:00 · 2017-08-13 04:37:12 +08:00 · 2017-08-04 23:55:51 +08:00 · 2017-08-01 16:14:03 +08:00
2 changed files with 4 additions and 4 deletions
@@ -12,7 +12,7 @@
        a.async = 1;
        a.src = g;
        m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+    })(window, document, 'script', 'https://www.lylinux.org/analytics.js', 'ga');

    ga('create', 'UA-27354903-4', 'auto');
    ga('send', 'pageview');
@@ -27,7 +27,7 @@
          href="{{ SITE_BASE_URL }}feed"/>

    <link rel='stylesheet' id='twentytwelve-fonts-css'
-          href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700&#038;subset=latin,latin-ext'
+          href='https://fonts.proxy.ustclug.org/css?family=Open+Sans:400italic,700italic,400,700&#038;subset=latin,latin-ext'
          type='text/css' media='all'/>
    {% compress css %}
        <link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'
Author	SHA1	Message	Date
liangliang	6afb2efc94	Merge branch 'master' into modifycdn	2017-09-03 15:37:45 +08:00
liangliang	7eb6cc88af	Merge branch 'master' into modifycdn	2017-08-13 04:37:12 +08:00
liangliang	899c4f22a5	Merge branch 'master' into modifycdn	2017-08-04 23:55:51 +08:00
liangliangyy	67e1a59b2e	修改cdn地址	2017-08-01 16:14:03 +08:00