@schuemie
schuemie Merge branch 'develop' of https://github.com/OHDSI/Andromeda into dev…
74ca4d2 Jul 16, 2020
Merge branch 'develop' of https://github.com/OHDSI/Andromeda into dev… 
…elop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
74ca4d2