Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 10:46:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare for merging

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-11-27 18:44:10 +01:00
parent b1860d8682
commit 1d4ca64dee
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
27 changed files with 1442 additions and 992 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/rsserver/p3face.h
View file

@ -34,7 +34,6 @@
#include "retroshare/rsiface.h"
#include "retroshare/rstypes.h"
#include "util/rsthreads.h"
#include "jsonapi/jsonapi.h"
#include "chat/p3chatservice.h"
#include "gxstunnel/p3gxstunnel.h"
@ -141,7 +140,7 @@ public:
private:
std::string getSQLCipherVersion();
std::string getSQLCipherVersion(); // TODO: move to rsversion.h
// The real Server Parts.
@ -157,9 +156,6 @@ public:
RsPluginManager *mPluginsManager;
//sslroot *sslr;
JsonApiServer *mJsonAPIServer;
/* services */
p3heartbeat *mHeart;
p3discovery2 *mDisc;