Merge branch 'template'

Browse Source

Conflicts:
	templates/admin/default/customer-edit.html

...

This commit is contained in:

Manuel Raynaud

2013-09-12 15:44:23 +02:00

parent 7dbfb052f1 485e6dc29b

commit d6e1f99b35

18 changed files with 619 additions and 108 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tests/functionnal/casperjs/pictures/screenshot-category-rule.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 582 B