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
..
actioncomm.class.php	Merge pull request #2348 from tiaris/3.7_actionclassbug	2015-02-18 23:02:44 +01:00
cactioncomm.class.php	PHPDoc and misc fixes for several folders	2015-02-10 11:38:13 +01:00
ical.class.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-20 22:51:47 +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