dolibarr/htdocs/comm/propal
Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-06-29 00:09:28 +02:00
stats Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
tpl Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
apercu.php Update apercu.php 2014-11-27 21:03:01 +01:00
contact.php Removed closing php tag 2014-05-03 18:18:44 +02:00
document.php Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
index.php Working on finishing of look 2015-05-22 14:28:02 +02:00
info.php Removed closing php tag 2014-05-03 18:18:44 +02:00
list.php NEW Can filter proposal on a tag of a product 2015-06-08 15:07:37 +02:00
note.php Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00