Skip to content

Commit

Permalink
Merge branch '#2018-js-load-error' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KasperBrandt committed Feb 24, 2016
2 parents 3e03220 + b74c6f2 commit 3d194ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
1 change: 1 addition & 0 deletions akvo/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<script src="//dragon.ak.fbcdn.net/hphotos-ak-prn1/t39.3284-6/851567_673854412678843_1478589082_n.js"></script>
{% endblock react_js %}

<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
{% compressed_js 'rsr' %}
{% compressed_js 'rsr_lib' %}

Expand Down
7 changes: 1 addition & 6 deletions akvo/templates/myrsr/user_management.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@

{% load bootstrap3 compressed i18n rules %}

{% block title %}{% trans 'MyRSR - My updates' %}{% endblock %}

{% block head_js %}
{# React #}
<script src="//fb.me/react-0.10.0.js"></script>
{% endblock head_js %}
{% block title %}{% trans 'MyRSR - User management' %}{% endblock %}

{% block myrsr_main %}

Expand Down

0 comments on commit 3d194ea

Please sign in to comment.