Jakob Borg 05642a3e17 Merge remote-tracking branch 'syncthing/pr/1436' ...

* syncthing/pr/1436:
  Remove red if we managed to report to atleast one discovery server (fixes #1427)

Conflicts:
	internal/auto/gui.files.go

2015-03-09 23:47:41 +01:00

..

assets

Add missing translation strings (fixes #1430)

2015-03-09 12:02:30 +00:00

scripts/syncthing

Don't follow the prototype chain when looking for a folder name (fixes #1387)

2015-03-01 22:10:34 +01:00

vendor

Revert "Update bootstrap" (fixes #1121)

2014-12-18 22:32:03 +01:00

index.html

Merge remote-tracking branch 'syncthing/pr/1436'

2015-03-09 23:47:41 +01:00

modal.html

Use more inclusive copyright header

2014-11-17 12:54:42 +01:00