[gnome-tour/wip/exalm/colors: 9/9] Merge branch 'master' into 'wip/exalm/colors'




commit d37ad84434cdb513cf66571d451856a515b8f5b4
Merge: 1c6db82 2abafa1
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Fri Dec 31 16:57:33 2021 +0000

    Merge branch 'master' into 'wip/exalm/colors'
    
    # Conflicts:
    #   data/resources/style.css

 Cargo.lock                   | 275 +++++++++++++++++++++++++++----------------
 Cargo.toml                   |   8 +-
 data/resources/style.css     |  15 ---
 src/application.rs           |   1 -
 src/main.rs                  |  10 +-
 src/widgets/pages/image.rs   |   3 +-
 src/widgets/pages/welcome.rs |   2 +-
 src/widgets/paginator.rs     |   2 +
 src/widgets/window.rs        |   3 -
 9 files changed, 191 insertions(+), 128 deletions(-)
---


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