Skip to content
Snippets Groups Projects
Commit f7d7960b authored by Shani's avatar Shani
Browse files

Merge branch 'release-5.13' into release-5.14

 Conflicts:
	front-end/.env
	library/Billrun/Version.php
	library/Tests/Aggregatortest.php
	library/Tests/aggregatorTestCases/test_nuber_200.php
	public/static/js/main.afc66a35.chunk.js
parents 9dca4acc 5a0d4da1
Loading
Showing
with 417 additions and 52 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment