Merge branch 'master' of gogs.informatik.hs-fulda.de:srieger/cloud-computing-msc-ai-examples

# Conflicts:
#	aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png
#	aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc.json
#	aws-cloudformation-demo/cloudcomp-counter-demo.json
#	aws-turnserver/stop.py
#	example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png
#	example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc.json
#	example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo.json
#	example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo-with-vpc-designer.png
#	example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo-with-vpc.json
#	example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo.json
#	example-projects/tug-of-war-in-the-clouds/stop.py
#	example-projects/turnserver/aws-boto3/start.py
#	example-projects/turnserver/aws-boto3/stop.py
This commit is contained in:
Sebastian Rieger
2019-07-02 22:15:45 +02:00
parent 7be146467e
commit 506b853e6f
13 changed files with 683 additions and 66 deletions

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>