 rMalie
|
3e46ac3358
|
// Merge -> revision 9435
|
2011-10-19 08:14:42 +00:00 |
|
|
rMalie
|
f1d5a3bf77
|
// Merge -> revision 9385
|
2011-10-17 09:55:33 +00:00 |
|
|
rMalie
|
eeb5b16112
|
// Merge -> revision 9221
|
2011-10-11 12:45:12 +00:00 |
|
|
rMalie
|
91083e190c
|
// Merge -> revision 8800
|
2011-09-27 14:30:06 +00:00 |
|
|
rMalie
|
2180359342
|
// Merge -> revision 8720
|
2011-09-22 15:45:10 +00:00 |
|
|
tDidierjean
|
b556966762
|
// remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
|
2011-09-20 15:53:57 +00:00 |
|
|
rMalie
|
dc0acaf026
|
// Merge -> revision 8123
|
2011-08-19 14:27:41 +00:00 |
|
|
rMalie
|
aa37be28db
|
// Merge -> revision 8059
|
2011-08-16 09:10:40 +00:00 |
|
|
tDidierjean
|
e9ab32ab1a
|
// Context part 25
|
2011-07-28 14:17:58 +00:00 |
|
|
rMalie
|
c17e7c236d
|
// MERGE with 1.4 r7770
|
2011-07-28 09:20:57 +00:00 |
|
|
rMalie
|
5f6f018885
|
// REVERT MERGE
|
2011-07-27 13:35:06 +00:00 |
|
|
rMalie
|
233c0076b7
|
// MERGE with trunk revision 7754
|
2011-07-27 12:48:42 +00:00 |
|
|
tDidierjean
|
6551a3ece7
|
// Context part 11
|
2011-07-18 15:50:58 +00:00 |
|
|
tDidierjean
|
b09c76f5b4
|
// Context part 5
|
2011-07-13 15:24:38 +00:00 |
|
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
|
mMarinetti
|
6b5b375b4b
|
[-] BO : Fixed #PSCFI-1736 - in AdminTranslations.php, only theme directory are parsed (and not files)
|
2011-05-02 15:50:39 +00:00 |
|
|
fBrignoli
|
b8f460ed46
|
// merge 1.4 => 6117
|
2011-04-29 09:09:38 +00:00 |
|
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|