upgrade dependencies #489

Merged

nikooo777 merged 4 commits from dependencies-upgrade into master

2018-08-10 22:18:05 +02:00

Author	SHA1	Message	Date
bill bittner	2b983b0b28	downgraded winston	2018-08-10 13:16:41 -07:00
bill bittner	c9f906151b	fixed merge conflicts	2018-08-10 11:35:32 -07:00
bill bittner	1757d586cb	Merge branch 'master' into dependencies-upgrade	2018-07-08 11:30:42 -07:00
Niko Storni	999670d1e4	UPGRADE dependencies and lockfile these changes could be breaking	2018-06-22 11:46:50 -04:00