dolibarr/htdocs/projet
Laurent Destailleur ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
..
activity Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
admin Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
class New: Can set page to use for getNomUrl of project. 2014-05-09 13:21:10 +02:00
tasks Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 19:20:48 +02:00
contact.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
document.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
element.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 19:20:48 +02:00
fiche.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
ganttchart.php Removed closing php tag 2014-05-03 18:18:44 +02:00
ganttview.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
index.php Removed closing php tag 2014-05-03 18:18:44 +02:00
jsgantt_language.js.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
liste.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
note.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
tasks.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00