merge chris

This commit is contained in:
Esben Sparre Andreasen
2020-12-10 11:29:11 +01:00
8268 changed files with 935217 additions and 164291 deletions
Generated Vendored
+7
View File
@@ -1,4 +1,11 @@
<<<<<<< HEAD:node_modules/async/LICENSE
Copyright (c) 2010-2018 Caolan McMahon
=======
The MIT License (MIT)
Copyright (c) 2014 Jonathan Ong me@jongleberry.com
>>>>>>> origin/results-cache-test:node_modules/mime-db/LICENSE
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal