eldy 6207b9262b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: dev/translation/langAutoParser.class.php htdocs/langs/tr_TR/agenda.lang htdocs/langs/tr_TR/boxes.lang htdocs/langs/tr_TR/install.lang htdocs/langs/tr_TR/other.lang		2011-10-10 15:10:14 +02:00
..
banks.lang
bookmarks.lang
compta.lang
contracts.lang
dict.lang
ecm.lang
ftp.lang
install.lang	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2011-10-10 15:10:14 +02:00
interventions.lang
mails.lang
main.lang
other.lang	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2011-10-10 15:10:14 +02:00
paybox.lang
paypal.lang
shop.lang
users.lang