merging master

This commit is contained in:
Abhinav Adduri 2017-07-21 13:36:26 -07:00
commit 09a6192bf5
12 changed files with 74 additions and 62 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "firefox-send",
"version": "0.1.2",
"version": "0.2.0",
"lockfileVersion": 1,
"dependencies": {
"accepts": {