Files
dolibarr/htdocs/core/lib
Laurent Destailleur 938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
2015-02-20 22:51:47 +01:00
..
2015-02-10 10:52:48 +01:00
2015-02-03 11:25:51 +01:00
2014-12-22 03:01:31 +01:00
2015-02-10 10:52:48 +01:00
2014-11-15 18:30:37 +01:00