marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sportabzeichen

Browse Source
This commit is contained in:
marko
2022-05-14 10:57:20 +02:00
parent 9e15a9d3fb 3d3601eee2
commit dd85a1c029
404 changed files with 14650 additions and 9325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
homepage/cwsvJudo/Makefile
View File

@@ -114,7 +114,15 @@ build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@
@@ -124,7 +132,15 @@ build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@