Merge upstream master and update web dependencies

This commit is contained in:
Tyler Vigario
2020-06-09 17:16:31 -07:00
13 changed files with 105 additions and 62 deletions

File diff suppressed because one or more lines are too long