Skip to content
Snippets Groups Projects
Commit 50aa3650 authored by aspangaro's avatar aspangaro
Browse files

Merge remote-tracking branch 'Upstream/develop' into develop-32

Conflicts:
	htdocs/expensereport/card.php
parents 8d0e7261 b2c1365e
No related branches found
No related tags found
No related merge requests found
Showing
with 493 additions and 248 deletions
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