Commit 3f521516 authored 9 years ago by Laurent Destailleur

dolibarr

into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php

parents bf883e15 766c5872

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 62 additions and 55 deletions

Please register or to comment

Admin message

Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr