Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged upstream/master

Browse source
This commit is contained in:
csoler 2020-09-11 21:36:45 +02:00
commit 2e6a87a2ea
84 changed files with 2515 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -32,6 +32,8 @@
#include <retroshare/rsdisc.h>
#include <retroshare/rsmsgs.h>
#include <retroshare-gui/mainpage.h>
#include "gui/help/browser/helpbrowser.h"
#include "gui/common/PeerDefs.h"
#include "gui/common/StatusDefs.h"
@ -40,7 +42,6 @@
#include "gui/common/AvatarDefs.h"
#include "gui/common/FilesDefs.h"
#include "gui/MainWindow.h"
#include "mainpage.h"
#include "util/DateTime.h"
#include "util/misc.h"