Merge branch 'master' of github.com:kylewm/woodwind

This commit is contained in:
Kyle Mahan 2015-02-19 23:21:49 -08:00
commit 8e3a671531
2 changed files with 2 additions and 2 deletions

View file

@ -8,7 +8,7 @@
<link rel="shortcut icon" href="{{ url_for('static', filename='logo.png') }}"/>
<link rel="apple-touch-icon" href="{{ url_for('static', filename='logo.png') }}"/>
<link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-02-15') }}"/>
<link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2015-02-19') }}"/>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"/>
<script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>

View file

@ -1,6 +1,6 @@
{% extends "base.jinja2" %}
{% block head %}
<script src="{{url_for('static', filename='feed.js', version='2015-02-15')}}"></script>
<script src="{{url_for('static', filename='feed.js', version='2015-02-19')}}"></script>
{% if current_user and current_user.settings
and current_user.settings.get('reply-method') == 'indie-config' %}