-
Germán Poo-Caamaño authored
Conflicts fixed during merge: .gitlab-ci.yml data/org.gnome.Evince.metainfo.xml.in libmisc/ev-page-action-widget.c libview/ev-annotation-window.c meson.build
af891aab
Conflicts fixed during merge: .gitlab-ci.yml data/org.gnome.Evince.metainfo.xml.in libmisc/ev-page-action-widget.c libview/ev-annotation-window.c meson.build