Merge master

This commit is contained in:
An Phan 2016-06-25 22:37:48 +08:00
commit a46b278d80
No known key found for this signature in database
GPG key ID: 05536BB4BCDC02A2

View file

@ -19,7 +19,7 @@ env:
LASTFM_API_SECRET: bar
branches:
- vue2
- master
install:
- . $HOME/.nvm/nvm.sh