Marcos García de La Fuente 460a2ec2ab Merge branch 'develop' into commercial-name ... Conflicts: htdocs/categories/categorie.php htdocs/comm/prospect/list.php		2015-05-25 15:09:46 +02:00
..
doc_generic_proposal_odt.modules.php	Fix: Bad parameter of get_substitutionarray_other	2014-10-15 18:16:41 +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
pdf_azur.modules.php	Merge branch 'develop' into commercial-name	2015-05-25 15:09:46 +02:00