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

Merge branch 'release-5.13' into release-5.14 

 Conflicts:
	application/modules/Billapi/Models/Entity.php
	front-end/.env
	library/Billrun/Version.php
	public/static/js/main.bc40ed07.chunk.js
parents 80aac1ba c0cd983b
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 90 additions and 32 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment