Merge branch 'master' of https://github.com/thelia/thelia

Browse Source

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html

...

This commit is contained in:

franck

2013-09-04 17:40:34 +02:00

parent 6387182026 ba645764fc

commit 866036a0bf

95 changed files with 10445 additions and 9883 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

templates/admin/default/assets/css/img/bg.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

templates/admin/default/assets/css/img/deconnexion.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.6 KiB

BIN

templates/admin/default/assets/css/img/header.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

templates/admin/default/assets/css/img/logo-light.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.5 KiB

BIN

templates/admin/default/assets/css/img/logo.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.8 KiB

BIN

templates/admin/default/assets/css/img/logout.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.6 KiB

BIN

templates/admin/default/assets/css/img/search-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.2 KiB

BIN

templates/admin/default/assets/css/img/search.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 KiB

BIN

templates/admin/default/assets/css/img/title-header.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

templates/admin/default/assets/css/img/top-bar-logo.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.6 KiB

BIN

templates/admin/default/assets/css/img/top.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB