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	Merge remote-tracking branch 'syncthing/pr/1577'	2015-04-06 20:53:32 +02:00
beacon	MPLv2	2015-03-17 16:02:27 +01:00
config	Copy configuration struct when sending Changed() events	2015-04-05 21:07:15 +02:00
db	Implement version vectors	2015-03-25 23:10:34 +01:00
discover	Implement version vectors	2015-03-25 23:10:34 +01:00
events	Push model data instead of pull (fixes #1434)	2015-04-01 11:46:30 +02:00
fnmatch	Test combination of prefixes (@benapetr)	2015-04-05 11:45:43 +02:00
ignore	golint: FNM_FOOBAR -> fnmatch.FooBar	2015-04-04 22:03:03 +02:00
model	model: Use separate db commit routine (fixes #1558)	2015-04-05 16:19:14 +02:00
osutil	Skip unspecified IPs	2015-03-19 12:44:38 +00:00
scanner	Support multiple scan query strings at the same time	2015-03-28 22:40:13 +01:00
stats	MPLv2	2015-03-17 16:02:27 +01:00
symlinks	MPLv2	2015-03-17 16:02:27 +01:00
upgrade	go vet: t.Errorf -> t.Error	2015-04-04 21:58:21 +02:00
upnp	MPLv2	2015-03-17 16:02:27 +01:00
versioner	use Lstat instead of Stat to prevent errors with symlinks	2015-03-19 17:36:15 +01:00