Merge pull request #1290 from krozycki/master

Ensuring path separator at the end of the folder path. (fixes #1262)

internal/config/config.go

@@ -26,6 +26,7 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/calmh/logger"
 	"github.com/syncthing/protocol"
@@ -261,6 +262,10 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 			continue
 		}
 
+		if !strings.HasSuffix(folder.Path, string(filepath.Separator)) {
+			folder.Path += string(filepath.Separator)
+		}
+
 		if folder.ID == "" {
 			folder.ID = "default"
 		}