Merge branch 'master' into homepage

This commit is contained in:
marko
2022-02-19 10:41:26 +01:00
94 changed files with 4165 additions and 67 deletions

View File

@@ -94,7 +94,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
touch $@
@@ -105,7 +109,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/phpcount
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
@@ -114,7 +122,11 @@ build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@
@@ -124,7 +136,11 @@ build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@