Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nonoroazoro committed Dec 2, 2017
2 parents c538867 + c0b47de commit 4f7c8ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelogs

## 1.5.0 - November 30, 2017
## 1.5.0 - December 2, 2017

- Changed: Rewrite in `TypeScript`, now we have `typings`.
- Added: Pick `http_proxy` settings from `http_proxy` and `https_proxy` environment variables.
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "syncing",
"displayName": "Syncing",
"description": "Sync every settings with your own GitHub Gist.",
"version": "1.4.9",
"version": "1.5.0",
"publisher": "nonoroazoro",
"author": {
"email": "[email protected]",
Expand All @@ -11,8 +11,8 @@
},
"homepage": "https://github.com/nonoroazoro/vscode-syncing",
"license": "MIT",
"main": "./dist/src/extension",
"icon": "./resources/logo.png",
"main": "dist/src/extension",
"icon": "resources/logo.png",
"repository": {
"type": "git",
"url": "https://github.com/nonoroazoro/vscode-syncing"
Expand Down

0 comments on commit 4f7c8ff

Please sign in to comment.