Skip to content
Snippets Groups Projects
Commit dd3f5a32 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into 3.8

Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
parents 1b67a9fa ebf68ecb
No related branches found
No related tags found
No related merge requests found
Showing
with 364 additions and 163 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment