From 1836ef28840ebb5e63b3dab4ca087f2bf1fd921d Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 20 Jul 2015 14:48:03 +0200 Subject: [PATCH] Squashed commit of pull request #1981 Conflicts: gui/scripts/syncthing/core/controllers/syncthingController.js internal/auto/gui.files.go --- gui/index.html | 16 ++-- .../core/controllers/syncthingController.js | 90 +++++++++---------- internal/auto/gui.files.go | 6 +- 3 files changed, 53 insertions(+), 59 deletions(-) diff --git a/gui/index.html b/gui/index.html index bc586b7d0..4053e0aaa 100755 --- a/gui/index.html +++ b/gui/index.html @@ -49,7 +49,7 @@