avior/code-stats-vscode
1
0
Fork 0
mirror of https://gitlab.com/aviortheking/code-stats-vscode.git synced 2025-04-22 10:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Juha Ristolainen 2018-07-05 11:24:51 +02:00
parent d2a11145be
commit 776fde9ce0
No known key found for this signature in database
GPG Key ID: D80C6C6D40707E83
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -2,24 +2,17 @@
All notable changes to the "code-stats-vscode" extension will be documented in this file. All notable changes to the "code-stats-vscode" extension will be documented in this file.
<<<<<<< HEAD
=======
## [1.0.12] - 2018-07-05 ## [1.0.12] - 2018-07-05
### Changed ### Changed
Updated some outdated dependency packages. Updated some outdated dependency packages.
>>>>>>> develop
## [1.0.11] - 2018-07-04 ## [1.0.11] - 2018-07-04
### Changed ### Changed
<<<<<<< HEAD
Fixed the missing lodash.template dependency for the merged HTML profile view. Fixed the missing lodash.template dependency for the merged HTML profile view.
=======
Fixed the missing lodast.template dependency
>>>>>>> develop
## [1.0.10] - 2018-07-04 ## [1.0.10] - 2018-07-04

3
README.md
View File

@ -24,13 +24,10 @@ This extension contributes the following settings:
## Release Notes ## Release Notes
<<<<<<< HEAD
=======
### 1.0.12 ### 1.0.12
Updated some outdated dependency packages. Updated some outdated dependency packages.
>>>>>>> develop
### 1.0.11 ### 1.0.11
Fixed the missing lodash.template dependency for the merged HTML profile view. Fixed the missing lodash.template dependency for the merged HTML profile view.

9
package.json
View File

@ -2,11 +2,7 @@
"name": "code-stats-vscode", "name": "code-stats-vscode",
"displayName": "Code::Stats", "displayName": "Code::Stats",
"description": "Code::Stats package for Visual Studio Code", "description": "Code::Stats package for Visual Studio Code",
<<<<<<< HEAD
"version": "1.0.11",
=======
"version": "1.0.12", "version": "1.0.12",
>>>>>>> develop
"license": "MIT", "license": "MIT",
"publisher": "riussi", "publisher": "riussi",
"contributors": [ "contributors": [
@ -67,13 +63,8 @@
"vscode": "^1.1.0", "vscode": "^1.1.0",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"growl": "^1.10.5", "growl": "^1.10.5",
<<<<<<< HEAD
"@types/node": "^6.0.40",
"@types/mocha": "^2.2.32"
=======
"@types/node": "^10.5.1", "@types/node": "^10.5.1",
"@types/mocha": "^5.2.4" "@types/mocha": "^5.2.4"
>>>>>>> develop
}, },
"dependencies": { "dependencies": {
"axios": "0.18.0", "axios": "0.18.0",