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-20 14:27:14 +02:00
2015-07-20 14:27:14 +02:00
2015-07-20 14:27:14 +02:00
2015-06-19 08:47:47 +02:00
2015-06-24 22:05:27 +01:00
2015-04-29 15:59:47 +02:00