Giuseppe Marino 33877f740d

Upstream merge: quick fix report chat now accepts a custom text for any reason ...

Will have to think about adding an additional parameter

2021-03-16 20:26:37 +01:00

..

Client.cpp

Upstream merge: quick fix report chat now accepts a custom text for any reason

2021-03-16 20:26:37 +01:00

Client.h

Fix conflict

2021-03-16 18:48:23 +01:00

ClientManager.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

ClientManager.h

Fix conflict

2021-03-16 18:48:23 +01:00

ClientParameters.h

Fix conflict

2021-03-16 18:48:23 +01:00

HttpConnection.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

HttpConnection.h

Update copyright year.

2021-01-06 17:24:16 +03:00

HttpServer.h

Update copyright year.

2021-01-06 17:24:16 +03:00

HttpStatConnection.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

HttpStatConnection.h

Fix conflict

2021-03-16 18:48:23 +01:00

Query.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

Query.h

Fix conflict

2021-03-16 18:48:23 +01:00

Stats.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

Stats.h

Fix conflict

2021-03-16 18:48:23 +01:00

StatsJson.h

Stats: json format (#22)

2021-01-24 18:09:53 +01:00

telegram-bot-api.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

WebhookActor.cpp

Fix conflict

2021-03-16 18:48:23 +01:00

WebhookActor.h

Add webhook response time to log.

2021-02-03 17:32:43 +03:00