Laurent Destailleur 805c73b849 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang

2015-04-02 14:04:04 +02:00

..

banks.lang

Sync from transifex

2015-04-02 13:56:32 +02:00

bills.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

main.lang

Merge remote-tracking branch 'origin/3.7' into develop

2015-04-02 14:04:04 +02:00

orders.lang

Sync from transifex

2015-04-02 13:28:20 +02:00