Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
S--Minecraft committed May 1, 2017
2 parents c2cd3ec + e388025 commit 834e660
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ script:
deploy:
provider: releases
api_key:
secure: M39EPkWuvv7LBabi45Oj+2KEtUyjjxL+61TIGDxpgoT27PVnCNdR/EUa6SQLxG6g9nJedvNXsEBpPQpQZTwK9dtX2HpBGwhtm63oQSgkU9J0vakhtau5+HBAcSdGB2BzFcXAVCmzIxtPYga39kD5kOXC6VaIYtlx7JPoneUjOXnCQAvPYNJ48+uI24fcZB/s5YfJbLszuwrxpHkdvVqaQuSqP5cvDUTFg7iO8Ss1jKx9IO8HmNM2EtbzYCxIwi1mt2hpOVUxUlr5Dp9aR/Xgv0HX0v042z3SCotRYVd2HmHoELwGgf34PJNtsVawTE6QJ7txlzdb5fS1TAHtQvKwt6uZTKhMhPwP5Js1/xzwvZHoVRyu6AIppw27KEbloR6dUVQgy0lV44ye5sXwe8B7ykWgtppVdSu23XD81tT3BUFgnz1XU3/pi0o0j3NzLS/yGqXeYG4Y6e+8YZz/asOs+L3eDn3HjBRjmATWBFjzYPiIQefQQAo5l/DA1DwDU4JygMOIiN5E6r6nNZgLrUXFq9l/9UMvU5vpzBOxS7VKoTiBoL3Fca6BztQY0ye4lIsw7S2h2uHI2YJJIhP3crGG/X2k/6yC0+tkVsDMohUHZLGvEwwkla+2TCXityBt/WFvA93KgQhH36ulvsjzbVgaYcwNCy36AATPBqF1RGP0pTs=
secure: PoVCHVrLqbaT0UVOQdtf1ZYDyd3n/Cr/2hcO7ptba082a7hKKjQHS9DFYO03W0vzNEDbElcBWmSzF8V1053vlHuuHfbIzG501sWtw2Gl0YQKinovJUngFY6CBLpkohVbdY+WUJ+K0ZHrAWWOEeE7ucaAwEklhuBhNRgSGTqC3MXTzVKyU660OJ75TemRtByW1k0sHpLU4lyZLb2m+x7M68afNrMAwc3YxJW5FiVgSH5Zu/JbrwNUpE+Py7Q8KCxk0uAIHED+eSiTuoBJuNYGtB2xrr2SpigbNB9+/6UK3ZzviOEvF581kfiV3pYrKDvu1y2+g5/48f67diD6DV8Zp8NYtk+uUeSH1VBzU7D8z/jHQ87ZSdDE+Zri7UcnzL8IWi1JGe5Jrib28YSt5xMwVOnYaFzpuIlC7iBHvRK7RudmlNLpUn8fAOOfEEeEM5rIISFa8hiPeScUBvDQhvYpsQBVrwgGH7LODn+/4UxHKLMsO477AUDAKV2+EOdrPbeTsZyJghTsmrveR+xm/FCeZU2cgaqhXlSTGyyug+069VVPDZggNP2/xIaS7DHaC1+UM3yzmLAw3b3hqmkpkAqpo5U7dvZk/CDHXtYiBkwXpFdCd2b3TEIcYLWqJZq9dkA+5XtB/Ijkdz51Rris8dZRX5s5TJ/wL+xbBr0/uNgeO10=
file:
- dist/mac/BlitzModder-$TRAVIS_TAG-mac.zip
- dist/mac/BlitzModder-$TRAVIS_TAG-mac.dmg
skip_cleanup: true
on:
repo: BlitzModder/BMPC
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BlitzModder",
"version": "1.3.1",
"version": "1.3.2",
"description": "Mod manager for World of Tanks Blitz(PC)",
"main": "bin/core/core.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BlitzModder",
"version": "1.3.1",
"version": "1.3.2",
"description": "Mod manager for World of Tanks Blitz(PC)",
"main": "core/core.js",
"author": "S(FV293b)",
Expand Down

0 comments on commit 834e660

Please sign in to comment.