diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-10-08 16:57:03 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-10-08 16:57:03 +0200 |
| commit | 99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6 (patch) | |
| tree | b337a2a83b3795518f6f82bbad85938fea40d916 /src/MainWindow.cpp | |
| parent | Implement signature upload for own master key (diff) | |
| parent | Merge pull request #294 from trilene/master (diff) | |
| download | nheko-99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6.tar.xz | |
Merge remote-tracking branch 'origin/master' into cross-signing
Diffstat (limited to 'src/MainWindow.cpp')
| -rw-r--r-- | src/MainWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp |
