Caught up to master (no changes taken)

* master: (61 commits)
  gui: Better accessibility for folder & device panels (fixes #2288)
  cmd/syncthing: Extract interfaces for things the API depends on
  cmd/syncthing: Return 500 with an error object instead of empty 200 on marshalling failure in REST response
  lib/model: Properly handle deleting multiple files when doing scans with subs (fixes #2851)
  lib/model: Correct handling of multiple subs when scanning (fixes #2851)
  lib/relay/client: Log relay client messages (fixes #2624)
  Confirmation box for when adding multiple folders on the same path (#1960)
  meta: Amend wweich in NICKS
  gui: Update translation files and assets
  gui: Differentiate local and remote devices more clearly
  gui: Improve layout of footer on narrow screens (fixes #2663)
  connections: The Max{Send,Recv}Kbps variables are supposed to be in KiB/s
  tests: messagediff argument order should be expected, actual
  Use Bootstrap tooltips instead of plain title attributes
  Amend norgeous
  Let "systemctl help" command work
  Add dinosore
  Don't show restart prompt when changing folder label (fixes #2840)
  Amend wweich
  Mend GUI tests
  ...
This commit is contained in:
Jakob Borg 2016-03-23 10:10:18 +01:00
commit 55e80c3883

Diff Content Not Available