Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

resolving conflict

Browse Source
This commit is contained in:
Marc Ducobu
2015-02-06 11:26:09 +01:00
parent 8d5d2189f1 9fadc5d9c5
commit 090f91e19a
16 changed files with 841 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/views/AccompanyingPeriod/form.html.twig
View File

@@ -25,7 +25,7 @@
{{ form_rest(form) }}
<div class="medium btn danger icon-right entypo icon-lock">
<button type="submit">{{ 'Close person accompanying period'|trans }}</button>
<button type="submit">{{ 'Submit'|trans }}</button>
</div>
{{ form_end(form) }}