Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia: Check if store_country has a value Fixed double '/' in generated assets URLs Add validation for Store configuration Use Store contact information Call the wrong AdminResources in saveAction Action buttons smaller Replace company_name and contact_email by store_name & store_email Add a new admin page to manage the basic store configurations Add routing for Store Configuration Add argument Title on Content Loop & Folder Loop
This commit is contained in:
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user