Merge branch 'master' of github.com:IonicaBizau/git-stats into cli-gh-cal

Conflicts:
	bin/git-stats
	lib/index.js
	package.json
This commit is contained in:
Ionică Bizău 2015-07-08 10:45:49 +03:00
commit 426a8bde61

View file

@ -12,7 +12,8 @@
"author": "Ionică Bizău <bizauionica@gmail.com>", "author": "Ionică Bizău <bizauionica@gmail.com>",
"contributors": [ "contributors": [
"Gnab <as0n@gnab.fr>", "Gnab <as0n@gnab.fr>",
"William Boman <william@redwill.se>" "William Boman <william@redwill.se>",
"Fabian Furger <mystyfly@gmail.com>"
], ],
"license": "MIT", "license": "MIT",
"devDependencies": {}, "devDependencies": {},