Commit 9acabc13 authored by Ivange Larry's avatar Ivange Larry

Merge branch 'master' into 'master'

Changed mysql wait time to 300000 See merge request librehealth/lh-radiology!20
parents 72c321ae 6ca22fd1
Pipeline #12466120 failed with stages
in 6 minutes 42 seconds