Merge with master

This commit is contained in:
Wyatt Roersma
2017-10-08 22:35:14 -06:00
4 changed files with 3 additions and 3 deletions

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "CTFd-multi-answer"]
path = CTFd-multi-answer
url = https://github.com/wroersma/CTFd-multi-answer

1
CTFd-Docker Submodule

Submodule CTFd-Docker added at 69be11a567

1
CTFd-Notify Submodule

Submodule CTFd-Notify added at 86722fe7c4

1
CTFd-S3-plugin Submodule

Submodule CTFd-S3-plugin added at cd68df7297