Laurent Destailleur 01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr ... into aspangaro-develop-patch34 Conflicts: htdocs/comm/action/class/actioncomm.class.php		2015-06-19 11:27:15 +02:00
..
class	Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr	2015-06-19 11:27:15 +02:00
rapport	Fix: Miscellaneous fixes for multicompany	2014-12-06 14:41:56 +01:00
card.php	Merge branch 'add_clone_on_event_agenda' of	2015-06-16 11:41:45 +02:00
document.php	Qual: deprecate dol_json_encode() and dol_json_decode()	2015-06-01 11:00:11 +02:00
index.php	[Qual] Fixed HTML input form disabled attribute	2015-05-07 14:21:14 +02: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 new navigation style.	2015-05-17 19:37:37 +02:00
peruser.php	[Qual] Fixed HTML input form disabled attribute	2015-05-07 14:21:14 +02:00