Squashed commit of pull request #1981

Browse Source

Conflicts:
	gui/scripts/syncthing/core/controllers/syncthingController.js
	internal/auto/gui.files.go

...

This commit is contained in:

Jakob Borg

2015-07-20 14:48:03 +02:00

parent 43d6322d0f

commit 1836ef2884

3 changed files with 53 additions and 59 deletions

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

6

internal/auto/gui.files.go

File diff suppressed because one or more lines are too long