hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

Browse Source 
# Conflicts:
#	.bowerrc
This commit is contained in:
Mike Ng
2018-01-08 16:37:46 +04:00
parent a853ec7d8d
commit a08a55b58e
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/web/common/index_bootstrap.html.twig
View File

@@ -25,7 +25,8 @@
<script type="text/javascript">
google.charts.load('42', {packages: ['corechart']});
</script>
<script type="text/javascript" src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript"
src="/assets/vendors/underscore/underscore{% if not app.debug %}.min{% endif %}.js"></script>
{% block rss %}{% endblock %}
{% block javascript %}{% endblock %}
</head>