Merge branch 'admin' of github.com:thelia/thelia into admin

Browse Source

...

This commit is contained in:

Manuel Raynaud

2013-06-21 10:37:32 +02:00

parent eff5529e1b ad47ab7cac

commit 299c20c885

2003 changed files with 1 additions and 1 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

0

core/lib/Thelia/Config/DatabaseConfiguration.php Normal file → Executable file

0

core/lib/Thelia/Config/DefinePropel.php Normal file → Executable file

0

core/lib/Thelia/Config/Resources/action.xml Normal file → Executable file

0

core/lib/Thelia/Config/Resources/config.xml Normal file → Executable file

0

core/lib/Thelia/Config/Resources/routing.xml Normal file → Executable file

0

core/lib/Thelia/Config/Resources/routing/admin.xml Normal file → Executable file