Merge branch 'master' into updatingpackages

rrainn · Dec 25, 2017 · 51e69ad · 51e69ad
2 parents ee7fab8 + 14f512e
commit 51e69ad
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json