Laurent Destailleur b267402df6 Merge remote-tracking branch 'origin/4.0' into develop ...

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php

2016-08-01 15:15:32 +02:00

..

admin

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

class

Merge branch 'refactor-rest-api' of

2016-07-27 14:06:14 +02:00

card.php

[Qual] Uniformize code

2015-10-31 17:21:48 +01:00

categorie.php

Fix of bugs reported by scrutinizer

2016-06-29 11:20:48 +02:00

edit.php

Fix bad link on category

2015-12-19 13:55:27 +01:00

index.php

Fix tag was not visible

2016-07-30 14:05:39 +02:00

photos.php

Fix css

2016-05-21 15:03:02 +02:00

traduction.php

Fix css

2016-05-21 15:03:02 +02:00

viewcat.php

Fix Debug and minor fixes

2016-06-20 10:54:02 +02:00