summary refs log tree commit diff
path: root/src/DeviceVerificationFlow.h
diff options
context:
space:
mode:
authortrilene <trilene@runbox.com>2020-10-28 16:08:17 -0400
committertrilene <trilene@runbox.com>2020-10-28 16:08:17 -0400
commitfd479a91be3c0c7f3204c94ce499edb6cf7fbd77 (patch)
tree9225e0c824f4c0e578e73c7dfba48dfaef277884 /src/DeviceVerificationFlow.h
parentFix crash on exit (diff)
parentMake back button bigger as it is hard to tap with your thumb (diff)
downloadnheko-fd479a91be3c0c7f3204c94ce499edb6cf7fbd77.tar.xz
Merge remote-tracking branch 'upstream/master' into webrtc-video
Diffstat (limited to 'src/DeviceVerificationFlow.h')
-rw-r--r--src/DeviceVerificationFlow.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/DeviceVerificationFlow.h b/src/DeviceVerificationFlow.h

index 70b5d9b3..d6e5411e 100644 --- a/src/DeviceVerificationFlow.h +++ b/src/DeviceVerificationFlow.h
@@ -3,6 +3,7 @@ #include <QObject> #include <mtx/responses/crypto.hpp> +#include <nlohmann/json.hpp> #include "CacheCryptoStructs.h" #include "Logging.h"