Laurent Destailleur
e5b401c8f2
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/langs/es_ES/agenda.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/suppliers.lang
2015-02-15 19:51:49 +01:00
..
2014-11-15 15:19:37 +01:00
2015-02-14 12:24:16 +01:00
2014-07-12 23:18:57 +02:00
2014-12-05 20:18:30 +01:00
2014-12-05 20:18:30 +01:00
2014-12-20 00:29:53 +01:00
2015-02-10 21:36:38 +01:00
2014-12-22 03:14:22 +01:00