Laurent Destailleur 46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into ... grandoc-develop Conflicts: htdocs/langs/ar_SA/admin.lang htdocs/langs/el_GR/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/tr_TR/admin.lang		2014-02-10 01:30:48 +01:00
..
actioncomm.class.php	Merge branch 'develop' of https://github.com/grandoc/dolibarr into	2014-02-10 01:30:48 +01:00
cactioncomm.class.php	Moved unreachable statement to conditions	2013-11-07 20:38:06 +01:00
ical.class.php	Timestamp is not a type	2013-11-07 21:47:13 +01:00