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
..
assets	Squashed commit of pull request #1990	2015-07-20 14:22:36 +02:00
scripts/syncthing	Squashed commit of pull request #1981	2015-07-20 14:48:03 +02:00
vendor	Update Bootstrap 3.1.0 -> 3.3.5	2015-07-05 11:05:38 +02:00
index.html	Squashed commit of pull request #1981	2015-07-20 14:48:03 +02:00
modal.html	MPLv2	2015-03-17 16:02:27 +01:00