Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history 
* master:
  update version

# Conflicts:
#	_config.yml
#	package.json
  • Loading branch information
@lh1me
lh1me committed Jun 12, 2020
2 parents d0c10ef + 6b951ba commit 2de3665
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2de3665

Please sign in to comment.