Permalink
Browse files

Merge branch 'refs/heads/develop'

  • Loading branch information...
2 parents 15e60b2 + 7a61953 commit b8a290dcaaf0b593d19fa8c8f7b13a2e0a0d80c1 @Osmose Osmose committed Aug 1, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −1 flicks/base/templates/shared/macros.html
  2. +2 −0 flicks/settings/base.py
@@ -151,7 +151,7 @@
</section>
<section class="runnerups">
- <h2>{{ _('Runner Ups') }}</h2>
+ <h2>{{ _('Runners-Up') }}</h2>
<ul>
{% for category_key, category_name in category_choices %}
{% set key = 'runner_up__%s__%s'|format(region_key, category_key) %}
View
@@ -198,6 +198,8 @@
CSP_SCRIPT_SRC = ("'self'",
'http://browserid.org',
'https://browserid.org',
+ 'http://login.persona.org',
+ 'https://login.persona.org',
'https://platform.twitter.com',
'https://connect.facebook.net',
'https://statse.webtrendslive.com',)

0 comments on commit b8a290d

Please sign in to comment.