[gnote/gnome-40: 3/3] Merge branch 'fixes' into 'gnome-40'

[Aurimas Černius <aurimasc src gnome org>]

commit bd692d82afbb16c11d69629f35ae94806a1ed513
Merge: 7ee4f0de f7cedffc
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Thu Apr 29 19:40:16 2021 +0000

    Merge branch 'fixes' into 'gnome-40'
    
    Misc fixes (gnome-40 branch)
    
    See merge request GNOME/gnote!16

 data/appdata/Makefile.am                                                | 2 +-
 .../{org.gnome.gnote.appdata.xml.in => org.gnome.Gnote.appdata.xml.in}  | 2 +-
 po/POTFILES.in                                                          | 2 +-
 src/abstractaddin.cpp                                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---