Giuseppe Marino 97872f5b87

merge conflict

2021-09-22 11:46:33 +02:00

..

Client.cpp

merge conflict

2021-09-22 11:46:33 +02:00

Client.h

merge conflict

2021-09-22 11:46:33 +02:00

ClientManager.cpp

merge conflict

2021-09-22 11:46:33 +02:00

ClientManager.h

Fix conflict

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

ClientParameters.h

merge conflict

2021-09-22 11:46:33 +02:00

HttpConnection.cpp

fix conflict

2021-06-28 13:41:22 +02:00

HttpConnection.h

Update copyright year.

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

HttpServer.h

Update TDLib.

2021-05-20 23:51:37 +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

merge conflict

2021-09-22 11:46:33 +02:00

Query.h

merge conflict

2021-09-22 11:46:33 +02:00

Stats.cpp

fix conflict

2021-06-28 13:41:22 +02: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

merge conflict

2021-09-22 11:46:33 +02:00

WebhookActor.cpp

fix conflict

2021-06-28 13:41:22 +02:00

WebhookActor.h

Add webhook response time to log.

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