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

Browse Source

* syncthing/pr/1577:
  Add uptime in webgui (fixes #1501)

Conflicts:
	cmd/syncthing/gui.go
	internal/auto/gui.files.go

...

This commit is contained in:

Jakob Borg committed 2015-04-06 20:53:32 +02:00

2 parents 0c0de17b38 b5d7ce8ebe

commit 207b43499c

7 files changed

+51 -6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmd/syncthing/.stfolder

Whitespace-only changes.