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

Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php

2020-05-27 23:07:18 +02:00

..

admin

add new rule

2020-05-21 15:05:19 +02:00

class

add new rule

2020-05-21 15:05:19 +02:00

bookmarks.lib.php

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

2020-05-27 23:07:18 +02:00

card.php

add new rule

2020-05-21 15:05:19 +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

list.php

add new rule

2020-05-21 15:05:19 +02:00