revert last conflic

This commit is contained in:
Manuel Raynaud
2013-12-09 16:18:59 +01:00
parent 462b2bec5e
commit eca8b01fb6

View File

@@ -119,16 +119,12 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="control-group">
<lablel>&nbsp;</lablel>
<div class="controls">
<p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div>
</div>
</div>
</div>
{include
file="includes/inner-form-toolbar.html"
hide_flags = true
close_url="{url path='/admin/folders' folder_id=$folder_id}"
}
<small>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>