Skip to content

Commit

Permalink
Merge branch '1.7' into '1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bertrand Dunogier committed Feb 9, 2017
2 parents 91c4f4b + 48ec341 commit 90d92d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Resources/translations/ezrepoforms_content_type.en.xlf
Expand Up @@ -7,8 +7,8 @@
</header>
<body>
<trans-unit id="38a48d5b27331f27a6a51e3bb9be3e6340fc1ccb" resname="content_type.edit_title">
<source>__content_type.edit_title</source>
<target>__content_type.edit_title</target>
<source>Edit &lt;%contentTypeName%&gt;</source>
<target>Edit &lt;%contentTypeName%&gt;</target>
<note>key: content_type.edit_title</note>
<jms:reference-file line="6">Resources/views/ContentType/update_content_type.html.twig</jms:reference-file>
</trans-unit>
Expand Down

0 comments on commit 90d92d8

Please sign in to comment.