Juanjo Menent c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/filefunc.inc.php		2015-09-08 21:08:59 +02: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
remisecheque.class.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-09-08 21:08:59 +02:00