dolibarr/htdocs/comm/action
Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
..
class Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-10 21:33:43 +01:00
rapport Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
card.php Fix class not found 2015-02-03 08:59:57 +01:00
document.php Fix divers 2014-11-07 23:07:15 +01:00
index.php Fix drag and drop in agenda view 2015-01-25 17:49:11 +01:00
info.php Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 2014-05-10 18:57:04 +02:00
listactions.php Fix: The filter into event views on user must be done on assigned 2015-01-15 02:06:04 +01:00
peruser.php Fix pb into date management. 2015-02-03 11:25:51 +01:00