Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source

Conflicts:
	admin-dev/themes/default/css/admin-theme.css

...

This commit is contained in:

Damien Metzger

2013-10-25 15:22:01 +02:00

parent e8d5dc8a62 a49cc68b72

commit aa322e4777

38 changed files with 3854 additions and 222 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

admin-dev/themes/default/css/admin-theme.css

+1 -1

File diff suppressed because one or more lines are too long