gmorel dc17f89729 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management ...

# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table

2013-09-24 18:41:57 +02:00

..

default

Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

2013-09-24 18:41:57 +02:00