gRoussac
|
c9d2cf8ed2
|
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
Conflicts:
admin-dev/header.inc.php
|
2013-07-17 16:31:49 +02:00 |
|
PrestaEdit
|
6ae0dbb4ca
|
[*] BO: use Translate::getAdminTranslation instead of translate()
|
2013-06-01 00:21:28 +02:00 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
vAugagneur
|
a1db83ef41
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
lLefevre
|
779cf350af
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
1c288bf01d
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
rMalie
|
a776684f13
|
// Rename correctly all hooks
|
2012-01-02 15:52:40 +00:00 |
|
fSerny
|
d5e265f75e
|
[*] PROJECT : New Module API (part 1)
|
2011-11-02 10:49:01 +00:00 |
|
tDidierjean
|
3d733ae6e2
|
// Context part 31
|
2011-08-17 10:07:12 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|