Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php

2018-09-04 21:35:43 +02:00

..

activity

Standardize

2018-08-15 12:48:13 +02:00

admin

Standardize

2018-08-15 12:48:13 +02:00

ajax

loadlangs

2018-05-26 21:11:25 +02:00

class

Standardize and update code

2018-09-02 11:08:41 +02:00

stats

Standardize

2018-08-15 12:48:13 +02:00

tasks

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

card.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

comment.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

contact.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

document.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

element.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-09-04 21:35:43 +02:00

ganttchart.inc.php

PSR2 FunctionClosingBrace

2018-08-29 21:25:22 +02:00

ganttview.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

graph_opportunities.inc.php

Fix for multicompany

2018-02-06 10:57:53 +01:00

index.php

Standardize

2018-08-15 12:48:13 +02:00

info.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

jsgantt_language.js.php

Clean defined constant at begin of pages

2018-04-21 12:00:55 +02:00

list.php

Standardize

2018-08-15 12:48:13 +02:00

note.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00

tasks.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-08-23 19:51:52 +02:00