mMarinetti 50531eae8f // merge, fix from 1.4 PSCFI-1466 ...

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

2011-04-15 14:39:53 +00:00

..

classes

// 1.5 branche creation

2011-04-12 18:24:40 +00:00

img

// 1.5 branche creation

2011-04-12 18:24:40 +00:00

langs

// merge 1.4 (5916) => 1.5.x

2011-04-15 10:30:56 +00:00

php

// merge from 1.4

2011-04-15 13:57:25 +00:00

sql

// merge 1.4 (5916) => 1.5.x

2011-04-15 10:30:56 +00:00

xml

// merge 1.4 (5916) => 1.5.x

2011-04-15 10:30:56 +00:00

controller.js

// merge 1.4 (5916) => 1.5.x

2011-04-15 10:30:56 +00:00

index.php

// merge, fix from 1.4 PSCFI-1466

2011-04-15 14:39:53 +00:00

model.php

// 1.5 branche creation

2011-04-12 18:24:40 +00:00

module_tools.php

// 1.5 branche creation

2011-04-12 18:24:40 +00:00

preactivation.php

// 1.5 branche creation

2011-04-12 18:24:40 +00:00

view.css

// merge 1.4 (5916) => 1.5.x

2011-04-15 10:30:56 +00:00