Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into jsonapi

Browse source
This commit is contained in:
G10h4ck 2018-10-10 22:23:28 +02:00 • committed by GitHub
commit 047ae7f723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
260 changed files with 1737 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/jsonapi/jsonapi.cpp
View file

@ -34,6 +34,7 @@
#include "retroshare/rsiface.h"
#include "retroshare/rsinit.h"
#include "util/rsurl.h"
#include "util/rstime.h"
// Generated at compile time
#include "jsonapi-includes.inl"

2
libretroshare/src/jsonapi/jsonapiitems.h
View file

@ -18,7 +18,7 @@
#pragma once
#include <string>
#include <ctime>
#include "util/rstime.h"
#include <cstdint>
#include <set>