Skip to content
Snippets Groups Projects
Commit 26e017f4 authored by aspangaro's avatar aspangaro
Browse files

Merge remote-tracking branch 'Upstream/develop' into 4.0-p9

Conflicts:
	htdocs/accountancy/admin/card.php
parents c9271e04 0d9a86db
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment