TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cleanmaster' into modules

Browse Source 
Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
This commit is contained in:
Etienne Roudeix
2013-12-16 09:57:35 +01:00
parent 76cd704f80 0e30ce2760
commit 536c88b4f8
14 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/backOffice/default/product-edit.html
View File

@@ -135,15 +135,12 @@
{javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
<script src="{$asset_url}"></script>
{/javascripts}
{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
<script src="{$asset_url}"></script>
{/javascripts}
{javascripts file='assets/js/jquery.typewatch.js'}
<script src="{$asset_url}"></script>
{/javascripts}
{javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
<script src="{$asset_url}"></script>
{/javascripts}