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-24 18:13:04 +02:00

parent 5ff406cdb8 5c3058d45b

commit f3d74c9461

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

Diff Content Not Available