Laurent Destailleur 78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/taxes.php		2018-03-12 19:09:57 +01:00
..
actioncomm.class.php	WIP to show event per hours	2018-03-07 11:53:30 +01:00
actioncommreminder.class.php	Work on reminders	2017-10-31 23:10:29 +01:00
api_agendaevents.class.php	FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}	2018-03-11 19:27:03 +01:00
cactioncomm.class.php	Fix scrutinizer	2017-11-29 17:58:13 +01:00
ical.class.php	Fix scrutinizer	2017-11-29 17:58:13 +01: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