Merge branch 'master' into jsonapi

This commit is contained in:
Gioacchino Mazzurco 2018-08-22 16:59:42 +02:00
commit 396fe49312
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
84 changed files with 3163 additions and 1501 deletions

View file

@ -65,6 +65,7 @@ linux-* {
rs_deep_search {
mLibs += xapian
win32-g++:mLibs += rpcrt4
}
static {