1836ef2884
Conflicts: gui/scripts/syncthing/core/controllers/syncthingController.js internal/auto/gui.files.go
Conflicts: gui/scripts/syncthing/core/controllers/syncthingController.js internal/auto/gui.files.go