Marcos García de La Fuente 15b1f03a08 Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/list.php htdocs/comm/prospect/list.php htdocs/societe/consumption.php htdocs/societe/soc.php		2015-04-19 00:48:07 +02:00
..
doc	Merge branch 'develop' into commercial-name	2015-04-19 00:48:07 +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
mod_propale_marbre.php	Doxygen	2014-08-31 23:18:09 +02:00
mod_propale_saphir.php	Fix: Masks works with thirdparty type	2015-03-04 18:18:55 +01:00
modules_propale.php	Scrutinizer Auto-Fixes	2015-04-07 00:45:30 +00:00