diff options
author | Nicolas Werner <nicolas.werner@gmx.net> | 2020-12-08 13:40:44 -0500 |
---|---|---|
committer | Nicolas Werner <nicolas.werner@gmx.net> | 2020-12-08 13:40:44 -0500 |
commit | 622a9f709b9a17d6c872d9de5ce9245951ab8bd6 (patch) | |
tree | 1c1c9cc322557301521fc02636443f12acb7e0f8 /src | |
parent | Merge pull request #349 from LorenDB/iconFromTheme (diff) | |
parent | Update ci flatpak sdk (diff) | |
download | nheko-622a9f709b9a17d6c872d9de5ce9245951ab8bd6.tar.xz |
Merge branch 'gitlab-ci' into 'master'
Update .gitlab-ci.yml See merge request nheko-reborn/nheko!1
Diffstat (limited to 'src')
-rw-r--r-- | src/Olm.cpp | 4 | ||||
-rw-r--r-- | src/Utils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp |