Skip to content

Commit

Permalink
Merge branch 'master' into pphillips/2236-overwrite-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
thetif authored Jul 27, 2020
2 parents bd00738 + 091c63b commit c1461ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"Richard Davis",
"Jenn Downs",
"Nicole Fenton",
"Tiffany Forkner",
"Eghosa Guobadia",
"Austin Hernandez",
"James Hupp",
Expand Down
1 change: 1 addition & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"Richard Davis",
"Jenn Downs",
"Nicole Fenton",
"Tiffany Forkner",
"Eghosa Guobadia",
"Austin Hernandez",
"James Hupp",
Expand Down

0 comments on commit c1461ed

Please sign in to comment.