diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-20 12:53:12 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-20 12:53:12 +0200 |
| commit | 6d7b6122e68c8d53b6e7533a6e5d5f55e33831e1 (patch) | |
| tree | 80bc2867510e3c9b7bc43578fc416165dae3876c /src/ui/certimportwidget.c | |
| parent | 2d52f13afb15232cc9c834f0aa14284bf9072a31 (diff) | |
| parent | 41f378c4b46cb5dd3599d44c81fa51d3183eefee (diff) | |
Merge branch 'work/v1.11' into dev
# Conflicts:
# res/lang/es.bin
# res/lang/ie.bin
# res/lang/ru.bin
# res/lang/sr.bin
# res/lang/uk.bin
Diffstat (limited to 'src/ui/certimportwidget.c')
0 files changed, 0 insertions, 0 deletions