Marion Muszynski
|
9a576cd82d
|
fix conflict braderie
|
2016-04-12 16:15:40 +02:00 |
|
Marion Muszynski
|
09299f983e
|
add id_sale and id_cat to define for consumable
|
2016-04-12 15:07:24 +02:00 |
|
Marion Muszynski
|
2c082e86f8
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 17:56:44 +01:00 |
|
Marion Muszynski
|
086f3f5906
|
add define
|
2016-03-16 17:56:03 +01:00 |
|
Marion Muszynski
|
bd3c6cb40c
|
merge frontController/config.inc
|
2016-02-24 17:23:16 +01:00 |
|
Marion Muszynski
|
ce7462c19e
|
labelgenerate
|
2016-02-24 17:12:23 +01:00 |
|
Srv Bebeboutik
|
0918b1e26d
|
push prod
|
2016-02-24 16:23:27 +01:00 |
|
Alexandre Simonet
|
3b2edf1aba
|
Fix config.inc
|
2016-02-24 15:44:20 +01:00 |
|
Alexandre Simonet
|
f2c49d87f7
|
Create module Contactform
|
2016-02-23 11:23:41 +01:00 |
|
Srv Bebeboutik
|
340bc7c146
|
push site
|
2016-01-04 12:48:08 +01:00 |
|