17 Commits

Author SHA1 Message Date
Marion Muszynski
e0c4e0dfe6 Merge branch 'ticket-10527' into develop 2016-08-31 14:55:15 +02:00
Marion Muszynski
abdbb008b5 adding reassurance sentences in payment step 2016-08-31 14:54:30 +02:00
Marion Muszynski
742a8d1ca9 fix conflicts 2016-08-31 13:36:10 +02:00
root
a2d5ed0a14 Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik 2016-08-31 11:09:42 +02:00
root
163411b776 modif trad 2016-08-31 11:08:56 +02:00
Marion Muszynski
bb5ff6ba97 fix conflicts 2016-08-31 11:04:16 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Srv Bebeboutik
3ec698aa01 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-06-06 12:03:14 +02:00
Srv Bebeboutik
1fab58c2d6 trad fr 2016-06-06 11:36:03 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Thibault GUILLAUME
3d0ebede08 test 2016-04-04 11:47:52 +02:00
Srv Bebeboutik
56f1489fbc petite trad 2016-03-31 12:08:39 +02:00
Srv Bebeboutik
0918b1e26d push prod 2016-02-24 16:23:27 +01:00
Srv Bebeboutik
241f738908 updateprod 2016-02-09 10:46:07 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00