vSchoener 1fbf610497 // Merge 1.4 => 1.5 ...

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9819 b9a71923-0436-4b27-9f14-aed3839534dd

2011-11-03 10:07:19 +00:00

..

library

// Merge 1.4 => 1.5

2011-11-03 10:07:19 +00:00

.htaccess

// Merge 1.4 => 1.5

2011-11-03 10:07:19 +00:00

config.xml

// Merge -> revision 8076

2011-08-17 08:15:38 +00:00

confirm.tpl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

de.php

// Merge -> revision 9352

2011-10-14 08:20:54 +00:00

en.php

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

es.php

// Merge with revision 7841

2011-08-02 11:43:58 +00:00

fr.php

// Merge -> revision 8720

2011-09-22 15:45:10 +00:00

gcheckout.gif

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

gcheckout.php

// Retro compatibility and updater improved for Discount/CartRules

2011-11-02 14:23:44 +00:00

htaccessBugInformation.php

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

index.php

// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00

it.php

// Merge -> revision 9352

2011-10-14 08:20:54 +00:00

logo.gif

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

payment_return.tpl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

payment.php

// Context part 31

2011-08-17 10:07:12 +00:00

payment.tpl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd

2011-07-06 10:54:11 +00:00

validation.php

// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00