Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/test-setup' into test-setup
Browse files Browse the repository at this point in the history 
# Conflicts:
#	jest.config.js
#	package-lock.json
#	package.json
  • Loading branch information
@adamjmcgrath
adamjmcgrath committed May 1, 2020
2 parents f6356ab + 0f17783 commit 65e3015
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 65e3015

Please sign in to comment.