// Merge -> revision 8342

This commit is contained in:
rMalie
2011-09-05 14:56:02 +00:00
parent d84373e4d3
commit 3d89058084
46 changed files with 1299 additions and 249 deletions
+4
View File
@@ -2,7 +2,11 @@
<module>
<name>ebay</name>
<displayName><![CDATA[eBay]]></displayName>
<<<<<<< .working
<version><![CDATA[1.2.1]]></version>
=======
<version><![CDATA[1.2.3]]></version>
>>>>>>> .merge-right.r8342
<description><![CDATA[Open your shop on the eBay market place !]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[market_place]]></tab>