Laurent Destailleur 1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php

2017-06-09 12:50:56 +02:00

..

admin

Look and feel v6

2017-05-18 13:13:18 +02:00

class

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

2017-06-09 12:50:56 +02:00

tpl

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

card.php

Maxi debug of v6

2017-06-07 19:28:31 +02:00

contact.php

Work on 6.0 look and feel

2017-03-28 21:04:38 +02:00

document.php

FIX #6945

2017-06-06 10:53:53 +02:00

index.php

Fix: use 0 instead false

2017-06-03 11:49:59 +02:00

info.php

Work on 6.0 look and feel

2017-03-28 21:04:38 +02:00

list.php

Fix syntax error

2017-06-08 14:55:12 +02:00

note.php

Work on 6.0 look and feel

2017-03-28 21:04:38 +02:00

services.php

Fix syntax error

2017-06-08 14:55:12 +02:00