Jakob Borg 1836ef2884 Squashed commit of pull request #1981 ...

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

2015-07-20 14:48:03 +02:00

..

syncthing

Squashed commit of pull request #1981

2015-07-20 14:48:03 +02:00