touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

font/fontawesome

Move temporarily fontawesome's font into the web folder

2013-10-18 15:50:42 +02:00

install

Change background image to simple background color

2013-09-19 10:15:14 +02:00

test_to_remove

Working : Image management set on Category

2013-09-22 20:50:42 +02:00

tinymce

Add languages files and set english by default

2013-09-18 18:09:07 +02:00

.htaccess

test if cache directory exists before launching debug bar

2013-09-18 09:34:48 +02:00

index_dev.php

send 403 response if clientdon't have trusted IP

2013-10-05 10:51:32 +02:00

index.php

Merge

2013-07-08 13:25:08 +02:00

phpinfo.php

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00