1 Commits

Author	SHA1	Message	Date
Jakob Borg	207b43499c	Merge remote-tracking branch 'syncthing/pr/1577' ... * syncthing/pr/1577: Add uptime in webgui (fixes #1501) Conflicts: cmd/syncthing/gui.go internal/auto/gui.files.go	2015-04-06 20:53:32 +02:00