Laurent Destailleur 4f4ebfaed3 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/printipp/admin/printipp.php		2015-05-04 12:09:39 +02:00
..
admin.lang	Sync transifex	2015-04-22 14:58:06 +02:00
banks.lang	Sync from transifex	2015-04-02 13:56:32 +02:00
commercial.lang	Sync from transifex	2015-04-02 13:56:32 +02:00
companies.lang
externalsite.lang	Sync from transifex	2015-04-02 13:56:32 +02:00
interventions.lang	Sync transifex	2015-04-22 14:58:06 +02:00
mails.lang	Sync translation	2015-05-03 15:37:15 +02:00
main.lang	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-22 17:57:57 +02:00
orders.lang	Sync transifex	2015-04-22 14:58:06 +02:00
other.lang	Sync transifex	2015-04-22 14:58:06 +02:00
productbatch.lang	Sync transifex	2015-04-22 14:58:06 +02:00
salaries.lang	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-02 14:04:04 +02:00
stocks.lang	Sync transifex	2015-04-22 14:58:06 +02:00
suppliers.lang	Sync from transifex	2015-04-02 13:56:32 +02:00
trips.lang	Sync transifex	2015-04-22 14:58:06 +02:00