Merge branch 'develop' into master

This commit is contained in:
Daniel_I_Am 2020-08-24 16:03:51 +02:00
commit c83771bddd
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
2 changed files with 2 additions and 1 deletions

View File

@ -3,6 +3,7 @@ image: mcr.microsoft.com/dotnet/core/sdk:3.0-alpine3.11
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive
OBJECTS_DIRECTORY: 'obj' OBJECTS_DIRECTORY: 'obj'
NUGET_PACKAGES_DIRECTORY: '.nuget' NUGET_PACKAGES_DIRECTORY: '.nuget'
SOURCE_CODE_PATH: 'ChaosBot/*/' SOURCE_CODE_PATH: 'ChaosBot/*/'

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "ChaosBot/wwwroot"] [submodule "ChaosBot/wwwroot"]
path = ChaosBot/wwwroot path = ChaosBot/wwwroot
url = ssh://git@git.chaoticlogic.us:2302/discord-bots/chaosbot-frontend.git url = ../chaosbot-frontend.git