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
..
2015-07-05 11:05:38 +02:00
2015-03-17 16:02:27 +01:00