[gnome-documents: 2/3] Merge branch 'master' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit e71f7bad6b8e7e954e40c64e00caf7c4a08bad6a
Merge: 50bdbbe4 c3e81571
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Thu Jul 5 04:16:17 2018 +0000

    Merge branch 'master' into 'master'
    
    # Conflicts:
    #   data/org.gnome.Books.appdata.xml.in

 data/org.gnome.Books.appdata.xml.in |  2 +-
 flatpak/org.gnome.Books.json        | 18 ++++++-------
 flatpak/org.gnome.Documents.json    | 16 ++++++------
 gnome-documents.doap                |  9 +------
 man/gnome-books.xml                 |  2 +-
 man/gnome-documents.xml             |  2 +-
 src/application.js                  | 52 +++++++++++++++----------------------
 src/trackerController.js            |  8 +++++-
 8 files changed, 49 insertions(+), 60 deletions(-)
---