Browse Source

Merge branch 'master' of git-crysp.uwaterloo.ca:miti/mitigator into new-graphene

Miti Mazmudar 4 years ago
parent
commit
553b913179
3 changed files with 4 additions and 4 deletions
  1. 2 1
      LICENSE.txt
  2. 2 2
      README.md
  3. 0 1
      docker/Dockerfile

+ 2 - 1
LICENSE.txt

@@ -1,4 +1,5 @@
-This software is licensed under the MIT License, however, other code that is used within it may be licensed under more restrictive licenses. 
+This software is licensed under the MIT License. However, some dependencies
+of this software are licensed under more restrictive licenses.
 
 MIT License
 

File diff suppressed because it is too large
+ 2 - 2
README.md


+ 0 - 1
docker/Dockerfile

@@ -93,4 +93,3 @@ COPY deploy_enclaves.sh ./
 RUN chmod 755 ./deploy_enclaves.sh
 COPY find_docker_ip.sh ./
 RUN chmod 755 ./find_docker_ip.sh
-

Some files were not shown because too many files changed in this diff