Laurent Destailleur cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php htdocs/langs/el_GR/projects.lang htdocs/langs/en_GB/bills.lang htdocs/langs/en_GB/main.lang htdocs/langs/en_GB/orders.lang htdocs/langs/es_AR/bills.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/main.lang htdocs/langs/es_ES/bills.lang htdocs/langs/es_ES/projects.lang htdocs/langs/fa_IR/categories.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/other.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/lv_LV/bills.lang htdocs/langs/nb_NO/bills.lang htdocs/langs/pl_PL/bills.lang htdocs/langs/pl_PL/mails.lang htdocs/langs/pl_PL/projects.lang htdocs/langs/ro_RO/bills.lang htdocs/langs/ro_RO/products.lang htdocs/langs/ro_RO/projects.lang htdocs/langs/ru_RU/bills.lang htdocs/langs/ru_RU/projects.lang htdocs/langs/sl_SI/main.lang htdocs/langs/tr_TR/bills.lang htdocs/langs/tr_TR/projects.lang htdocs/langs/vi_VN/bills.lang		2015-04-02 13:57:20 +02:00
..
expedition.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-02 13:57:20 +02:00
expeditionbatch.class.php	Doxygen	2015-03-10 14:23:40 +01:00
expeditionstats.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00