Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-29 19:56:09 +01:00
Code Issues Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
Mickael Kerjean 2021-08-22 16:41:45 +10:00
commit 4ef1017e65
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/common/config.go
View file

@ -356,6 +356,10 @@ func (this Configuration) Export() interface{} {
DisplayHidden bool `json:"display_hidden"`
AutoConnect bool `json:"auto_connect"`
Name string `json:"name"`
<<<<<<< HEAD
=======
RememberMe bool `json:"remember_me"`
>>>>>>> 96c32d4447138d628ede2943fe343bd82ae7454b
UploadButton bool `json:"upload_button"`
Connections interface{} `json:"connections"`
EnableShare bool `json:"enable_share"`
@ -369,6 +373,10 @@ func (this Configuration) Export() interface{} {
DisplayHidden: this.Get("general.display_hidden").Bool(),
AutoConnect: this.Get("general.auto_connect").Bool(),
Name: this.Get("general.name").String(),
<<<<<<< HEAD
=======
RememberMe: this.Get("general.remember_me").Bool(),
>>>>>>> 96c32d4447138d628ede2943fe343bd82ae7454b
UploadButton: this.Get("general.upload_button").Bool(),
Connections: this.Conn,
EnableShare: this.Get("features.share.enable").Bool(),