mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-01-06 04:09:40 -06:00
Merge branch 'master' into ocis-1715-lighter-runtime
This commit is contained in:
@@ -2,7 +2,9 @@ SHELL := bash
|
||||
NAME := web
|
||||
|
||||
############ tooling ############
|
||||
ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI
|
||||
include ../.bingo/Variables.mk
|
||||
endif
|
||||
|
||||
############ go tooling ############
|
||||
include ../.make/go.mk
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Code generated by fileb0x at "2021-03-08 16:13:22.234771 +0000 WET m=+0.110173709" from config file "embed.yml" DO NOT EDIT.
|
||||
// modification hash(6f73b44b9d86c8db7c5ee9784b8315c1.c9b7e50721daf642e7eab7fd220fff97)
|
||||
// Code generated by fileb0x at "2021-03-10 16:32:28.76666834 +0100 CET m=+0.117320721" from config file "embed.yml" DO NOT EDIT.
|
||||
// modification hash(2e1d51e5848ec6b0b38a67a7a2af81ca.c9b7e50721daf642e7eab7fd220fff97)
|
||||
|
||||
package assets
|
||||
|
||||
@@ -125,11 +125,6 @@ func init() {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
err = FS.Mkdir(CTX, "css/", 0777)
|
||||
if err != nil && err != os.ErrExist {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
err = FS.Mkdir(CTX, "js/", 0777)
|
||||
if err != nil && err != os.ErrExist {
|
||||
panic(err)
|
||||
@@ -160,6 +155,11 @@ func init() {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
err = FS.Mkdir(CTX, "css/", 0777)
|
||||
if err != nil && err != os.ErrExist {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
var f webdav.File
|
||||
|
||||
var rb *bytes.Reader
|
||||
|
||||
Reference in New Issue
Block a user