[gtk/matthiasc/for-master: 8/8] Merge branch 'master' into 'matthiasc/for-master'

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/matthiasc/for-master: 8/8] Merge branch 'master' into 'matthiasc/for-master'
Date: Thu, 1 Oct 2020 13:56:38 +0000 (UTC)


commit cbe3de9ce71d6a6a125609a870b1830312a181c6
Merge: 028cd1e23a 6de7022458
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 1 13:56:37 2020 +0000

    Merge branch 'master' into 'matthiasc/for-master'
    
    # Conflicts:
    #   .gitlab-ci/test-msys2.sh

 .gitlab-ci/test-msys2.sh       |  4 +--
 gtk/theme/Adwaita/_common.scss | 66 +++++++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 30 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]