Merge remote-tracking branch 'origin/master' into release-3.0.0 · phovea/phovea_vis@16c5077 · GitHub

This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Merge remote-tracking branch 'origin/master' into release-3.0.0

Browse files

# Conflicts:
#	package.json

Loading branch information

thinkh committed Dec 20, 2019

2 parents a2ae8c7 + 1ff6122 commit 16c5077