[gnome-builder/wip/tintou/no-context-duplicate: 4/4] Merge branch 'master' into wip/tintou/no-context-duplicate

[Corentin Noël <corentinnoel src gnome org>]

commit 8e62df1c500f9327bdca9a8753a7c24aa7b40991
Merge: a19027765 f4a0b073d
Author: Corentin Noël <corentin noel collabora co uk>
Date:   Tue Feb 6 14:00:20 2018 +0000

    Merge branch 'master' into wip/tintou/no-context-duplicate

 src/libide/keybindings/ide-shortcuts-window.ui |  7 -------
 src/libide/keybindings/vim.css                 | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)
---