diff options
author | Saturneric <[email protected]> | 2021-06-20 17:34:27 +0000 |
---|---|---|
committer | Saturneric <[email protected]> | 2021-06-20 17:34:27 +0000 |
commit | 510ae2fd8b21d2eab0dea88a738b165e9eae29e8 (patch) | |
tree | d37805cf808e005c492b36d80bc496e7de623221 /src/ui/KeyServerImportDialog.cpp | |
parent | Repair and improve the internationalization structure. (diff) | |
parent | Fix cmake.yml For Windows Build (diff) | |
download | GpgFrontend-510ae2fd8b21d2eab0dea88a738b165e9eae29e8.tar.gz GpgFrontend-510ae2fd8b21d2eab0dea88a738b165e9eae29e8.zip |
Merge branch 'main' of ssh://tunnel.bktus.com:30412/Saturneric/GPGFrontend into develop
Conflicts:
include/GpgFrontend.h
src/CMakeLists.txt
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions