Merge branch 'views-management' of https://github.com/thelia/thelia into views-management

Conflicts:
	templates/admin/default/tax-rule-edit.html
This commit is contained in:
mespeche
2013-09-30 10:14:11 +02:00
2 changed files with 105 additions and 96 deletions

View File

@@ -311,7 +311,7 @@
.panel-body{
.draggable{
.draggable, .drag{
margin: 5px 0;
padding: 10px;
border: 1px dashed @gray-light;