Merge branch '2.3' into develop

This commit is contained in:
Esa Korhonen
2019-02-20 10:33:14 +02:00
9 changed files with 398 additions and 311 deletions

View File

@ -32,4 +32,5 @@ extern const string FIELD_HOST;
extern const string FIELD_DB;
extern const string FIELD_ANYDB;
extern const string FIELD_AUTHSTR;
extern const string FIELD_PROXY;
extern const int NUM_FIELDS;