Merge remote-tracking branch 'origin/master'

# Conflicts: # package.json
phips28 · Oct 26, 2019 · 2c5fa2d · 2c5fa2d
2 parents 3bdcc3f + 7bfa336
commit 2c5fa2d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package-lock.json b/package-lock.json