Merge branch 'master' of github.com:mozilla/olympia

This commit is contained in:
verbatim updates user 2014-10-02 09:26:56 +00:00
Родитель 5b4da5850e 0bfa06f340
Коммит f327de46dd
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -19,7 +19,7 @@
href="{{ url('amo.opensearch') }}" />
{% block tabzilla_css %}
<link href="//mozorg.cdn.mozilla.net/media/css/tabzilla-min.css" rel="stylesheet" />
<link href="https://mozorg.cdn.mozilla.net/media/css/tabzilla-min.css" rel="stylesheet" />
{% endblock %}
{% block site_css %}
{{ css('zamboni/css') }}
@ -153,7 +153,7 @@
<script async defer src="{{ cache_buster(url('addons.buttons.js')) }}"></script>
{% endblock %}
{% block tabzilla_js %}
<script src="//mozorg.cdn.mozilla.net/{{ LANG }}/tabzilla/tabzilla.js"></script>
<script src="https://mozorg.cdn.mozilla.net/{{ LANG }}/tabzilla/tabzilla.js"></script>
{% endblock %}
{% block js %}{% endblock %}
{% block footer %}

Просмотреть файл

@ -19,7 +19,7 @@
href="{{ url('amo.opensearch') }}" />
{% block tabzilla_css %}
<link href="//mozorg.cdn.mozilla.net/media/css/tabzilla-min.css" rel="stylesheet" />
<link href="https://mozorg.cdn.mozilla.net/media/css/tabzilla-min.css" rel="stylesheet" />
{% endblock %}
{% block site_css %}
{{ css('zamboni/impala') }}
@ -212,7 +212,7 @@
<script async defer src="{{ cache_buster(url('addons.buttons.js')) }}"></script>
{% endblock %}
{% block tabzilla_js %}
<script src="//mozorg.cdn.mozilla.net/{{ LANG }}/tabzilla/tabzilla.js"></script>
<script src="https://mozorg.cdn.mozilla.net/{{ LANG }}/tabzilla/tabzilla.js"></script>
{% endblock %}
{% block js %}{% endblock %}
{% block js_extras %}{% endblock %}