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
..
auto_test.go	Enable gzip encoding static files for webgui	2015-04-06 03:11:30 +03:00
doc.go	MPLv2	2015-03-17 16:02:27 +01:00
gui.files.go	Merge remote-tracking branch 'syncthing/pr/1577'	2015-04-06 20:53:32 +02:00