rMalie
|
9d10de0848
|
// Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:05:10 +00:00 |
|
rMalie
|
de69396a04
|
// Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-11 12:45:12 +00:00 |
|
rMalie
|
3620f0837f
|
// Merge -> 8910
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-30 08:17:25 +00:00 |
|
rMalie
|
87df41c9d6
|
// Merge -> revision 8552
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-14 08:29:10 +00:00 |
|
rMalie
|
b50c7e4334
|
// Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 16:17:37 +00:00 |
|
rMalie
|
24e213cda8
|
// Merg// Merge -> revision 8395
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 16:23:13 +00:00 |
|
rMalie
|
39f2f53db2
|
// Merge -> revision 8363
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-06 12:38:55 +00:00 |
|
rMalie
|
79fd72e461
|
// Merge -> revision 8342
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 14:56:02 +00:00 |
|
tDidierjean
|
c2258ae8e9
|
//// Merge -> revision 8290
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-01 09:53:43 +00:00 |
|
rMalie
|
ffeb22bfb9
|
// Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
a1a32714ab
|
// Fix #PSFV-30 + context part 24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:12:17 +00:00 |
|
rMalie
|
31ed17058c
|
// Revert test
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7791 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:05:38 +00:00 |
|
rMalie
|
939d2a0cf5
|
// test
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:04:21 +00:00 |
|
rMalie
|
a875fecb20
|
// MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 09:20:57 +00:00 |
|
rMalie
|
be4811aa6e
|
// REVERT MERGE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 13:35:06 +00:00 |
|
rMalie
|
e159c925d8
|
// MERGE with trunk revision 7754
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 12:48:42 +00:00 |
|