[shotwell] (21 commits) Non-fast-forward update to branch wip/phako/configure-sidebar

[Jens Georg <jensgeorg src gnome org>]

The branch 'wip/phako/configure-sidebar' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  57e7370... wip: Make sidebar configurable

Commits added to the branch:

  d50f68d... added scrubbing funktionality to directory items (*)
  e831c31... Updated French translation (*)
  84652f9... camera: Add mtp to supported mount schemes (*)
  76a117b... camera: Temporarily remove libusb work-around (*)
  2b2f692... Update German translation (*)
  bc00a39... flatpak: Unblock device access (*)
  4e2d483... extended: Fix comment size for event view (*)
  ea0310f... extended: Adjust spacing (*)
  579af4e... import: Fix button icons (*)
  5c23ae8... flatpak: Allow access to gvfs subinterfaces (*)
  5653112... flatpak: Undo accidental clean-up removal (*)
  1e6ef04... Added French help translation (*)
  ee45730... camera: Use symbolic icons (*)
  b9bd1a9... plugins: Add override path (*)
  0d8a1f0... Remove merge left-over (*)
  c059696... reset to primary image when mouse leaves the eventdirectory (*)
  e952ce8... stepped selection to reduce flicker (*)
  cd78ba0... use 15 as min scrubbing distance (*)
  bd084d0... Merge branch 'image-scrubbing-squashed' into 'master' (*)
  6b9b46b... wip: Make sidebar configurable
  816d70b... wip

(*) This commit already existed in another branch; no separate mail sent