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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
This commit is contained in:
Romain Neutron
2013-12-09 14:17:03 +01:00
parent 5154fcac93 ef55bd29cc
commit 9580ff7585
7 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/login/layout/base-layout.html.twig
View File

@@ -108,7 +108,7 @@
{% if has_terms_of_use %}
<li>
{% block tou_link %}
<a href="{{ path("login_cgus") }}">{{ "Terms of use" | trans }}</a>
<a href="{{ path("login_cgus") }}" target="_blank">{{ "Terms of use" | trans }}</a>
{% endblock tou_link %}
</li>
{% endif %}