tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,678 Commits 1 Branch 22 Tags 99 MiB
eadb920736
Commit Graph

1017 Commits

Author SHA1 Message Date
levlam
957670aa0d Immediately close non-connected sockets. 2021-12-16 23:38:44 +03:00
levlam
01b02e9028 Remove deprecated EM_LOG_DEMANGLE flag. 2021-12-16 19:19:32 +03:00
Andrea Cavalli
f211df073e Merge remote-tracking branch 'td/master' 2021-12-16 16:36:15 +01:00
levlam
1782b8e478 Minor improvements. 2021-12-16 16:16:34 +03:00
levlam
1a98ac8004 Don't use min/max as variable names. 2021-12-15 20:55:03 +03:00
Andrea Cavalli
c037048ec3 Merge remote-tracking branch 'td/master' 2021-12-10 16:59:45 +01:00
levlam
ca8a8ad358 Remove ThreadSafeCounter usage. 2021-12-10 13:31:17 +03:00
levlam
1a9c6fa51c Add more logging. 2021-12-10 13:27:24 +03:00
levlam
106797f7f0 Improve private field names. 2021-12-10 13:07:55 +03:00
levlam
1bb9b7dfa9 Update clang-format to 13.0.1. 2021-12-10 00:27:13 +03:00
Andrea Cavalli
8e13003896 Merge remote-tracking branch 'td/master' 2021-11-22 23:28:02 +01:00
levlam
67aa9cad66 Allocate exactly specified size in ArrayAllocator. 2021-11-18 16:42:01 +03:00
levlam
6f3dc2afb1 Use new/delete instead of ArrayAllocator on external threads. 2021-11-18 16:22:54 +03:00
levlam
32713560b8 Move StackAllocator implementation to cpp. 2021-11-18 15:42:07 +03:00
levlam
bf9c78e982 Fix is_emoji. 2021-11-18 14:37:31 +03:00
levlam
fb39e5d746 SImplify StackAllocator::Ptr implementation. 2021-11-17 15:15:40 +03:00
Andrea Cavalli
48e3660d2c Merge remote-tracking branch 'td/master' 2021-11-14 22:46:37 +01:00
levlam
5e70be9d36 Improve CHECK. 2021-11-13 23:50:18 +03:00
levlam
b731414d42 Init some fields just in case. 2021-11-11 17:39:09 +03:00
levlam
712197ad6d Mark some constructors as noexcept. 2021-11-10 21:55:50 +03:00
levlam
96382d5621 Output no_color only if there was a color. 2021-11-10 19:06:12 +03:00
Andrea Cavalli
9c9772868b Merge remote-tracking branch 'td/master' 2021-11-05 16:11:03 +01:00
levlam
eb346f5573 Return both first and last error from mkpath. 2021-11-05 10:10:11 +03:00
levlam
ca7947cf44 Minor improvements. 2021-11-04 12:46:08 +03:00
levlam
6e8a88be35 Add TlStorerTotString.store_vector_begin. 2021-11-01 19:45:55 +03:00
levlam
f743c782bf Move TlStorerToString to TlStorerToString.h. 2021-11-01 19:21:24 +03:00
levlam
5e43075d3b Add TlStorerToString::store_object_field method. 2021-11-01 18:59:35 +03:00
Andrea Cavalli
9f3e26dea6 Merge remote-tracking branch 'td/master' 2021-10-29 14:56:39 +02:00
levlam
b5060687cc Add enable_if guards for forwarding constructors. 2021-10-29 15:05:28 +03:00
Andrea Cavalli
9b0d54de26 Merge remote-tracking branch 'td/master' 2021-10-29 00:31:20 +02:00
levlam
c5a2f1570d Remove superflous endif comments. 2021-10-25 10:05:15 +03:00
Andrea Cavalli
f11254bdcb Merge remote-tracking branch 'td/master' 2021-10-21 17:09:27 +02:00
levlam
9f44816a62 Minor improvements. 2021-10-21 12:51:16 +03:00
Andrea Cavalli
98244d1346 Merge remote-tracking branch 'td/master' 2021-10-20 02:21:14 +02:00
levlam
1e49f6dc13 Use auto as variable type if it is initialized with a cast. 2021-10-20 01:27:02 +03:00
levlam
41cc287d66 Improve checks. 2021-10-20 00:54:49 +03:00
levlam
db7aa28bdf A lot more minor improvements. 2021-10-19 18:11:16 +03:00
levlam
44a186c7c1 Minor improvements. 2021-10-18 19:26:14 +03:00
levlam
01976bed53 Minor warning fixes. 2021-10-18 15:37:21 +03:00
levlam
81b38d5607 Mark move constructors/assignment operators noexcept. 2021-10-18 14:36:15 +03:00
levlam
f35afe23c8 Minor warning fixes. 2021-10-18 12:57:13 +03:00
levlam
0782f56408 Use uint32 instead of unsigned int if possible. 2021-10-17 22:56:40 +03:00
levlam
9b7957c9c6 Minor warning fixes. 2021-10-17 13:07:20 +03:00
Andrea Cavalli
982b994332 Merge remote-tracking branch 'td/master' 2021-10-16 18:25:57 +02:00
levlam
c7ce933520 Improve Windows 11 detection. 2021-10-13 14:01:23 +03:00
levlam
038abf5466 Add sound to messageAnimatedEmoji. 2021-10-05 23:20:49 +03:00
levlam
ffe03ecb10 Add messageAnimatedEmoji. 2021-10-05 16:12:04 +03:00
Andrea Cavalli
897d4af16c Merge remote-tracking branch 'td/master' 2021-09-25 19:24:57 +02:00
levlam
61c3a2bcf5 Remove TD_EXPERIMENTAL_WATCH_OS. 2021-09-24 13:41:22 +03:00
levlam
d6f3d9f08a Use error code 400 instead of small error codes. 2021-09-24 10:59:51 +03:00
levlam
b6bde1e4c5 Move remove_emoji_modifiers to emoji.h. 2021-09-21 06:32:34 +03:00
levlam
3af0059b94 Add is_emoji method. 2021-09-20 22:30:23 +03:00
levlam
db18baa503 Unify include order. 2021-09-19 00:47:05 +03:00
Andrea Cavalli
6e1836a024 Merge remote-tracking branch 'td/master' 2021-09-15 16:03:11 +02:00
levlam
5a85c8a95b Improve error message. 2021-09-14 12:16:29 +03:00
levlam
47d3806c62 Move TlDowncastHelper to tdutils. 2021-09-12 19:04:22 +03:00
Andrea Cavalli
a20e8b6db3 Merge remote-tracking branch 'td/master' 2021-09-04 16:03:33 +02:00
levlam
86de43a048 Remove useless #include comments. 2021-09-03 23:21:44 +03:00
levlam
0b6d40b4b5 Update Unicode data to 14.0.0. 2021-09-18 21:31:50 +03:00
levlam
f0180b6132 Suppress warning about an empty file. 2021-09-02 11:51:33 +03:00
levlam
bfd76964ea Fix some GCC warnings on Windows. 2021-09-01 19:26:18 +03:00
Andrea Cavalli
232ce6e4d3 Merge remote-tracking branch 'td/master' 2021-08-23 02:22:28 +02:00
levlam
5b6e2d2c90 Add ThreadSafeCounter benchmark. 2021-08-18 19:26:03 +03:00
levlam
5349e63c2b Add Timeout::get_timeout. 2021-08-15 11:15:14 +03:00
levlam
99375ff157 Improve pos checks in KHeap. 2021-08-15 10:59:12 +03:00
levlam
65094f66bd Shrink long KHeap arrays. 2021-08-15 10:46:41 +03:00
levlam
84ad2e5b19 Remove redundant semicolons. 2021-08-30 23:27:32 +03:00
Andrea Cavalli
6b93b00f6a Merge remote-tracking branch 'td/master' 2021-07-27 23:35:50 +02:00
levlam
103b0efcaa Simplify JSON generation. 2021-07-27 09:41:11 +03:00
Andrea Cavalli
a580242be1 Merge remote-tracking branch 'td/master' 2021-07-23 15:19:00 +02:00
levlam
c45535d607 Fix warning. 2021-07-20 03:00:16 +03:00
levlam
c5cee50877 Fix TRY_STATUS_PROMISE usage with Result. 2021-07-17 23:37:03 +03:00
Andrea Cavalli
3dde04b17f Merge remote-tracking branch 'td/master' 2021-07-17 11:15:40 +02:00
levlam
a4186f8934 Fix BackoffQueue. 2021-07-04 18:52:48 +03:00
levlam
370d443a9d Explicitly specify inheritance mode. 2021-07-04 18:22:20 +03:00
levlam
40c5d47717 Make inherited classes final if possible. 2021-07-04 05:58:54 +03:00
levlam
edfa5d1d98 Use final instead of override. 2021-07-03 23:51:36 +03:00
levlam
3ead565d67 Improve OpenSSL 3.0 support. 2021-07-02 23:34:24 +03:00
Andrea Cavalli
c41ec7df43 Merge remote-tracking branch 'td/master' 2021-06-30 13:31:50 +02:00
levlam
4f00f445b7 Allow leading zeros in port number. 2021-06-27 03:58:26 +03:00
levlam
e18ff8a810 Close socket on Windows only after pending write is confirmed. 2021-06-14 19:06:23 +03:00
levlam
e73394ac98 Add comment about meaning of Working Set and Commit Charge. 2021-06-06 22:53:41 +03:00
levlam
7c4ff60f79 Trim trainling slashes in the parameter of CreateDirectoryFromAppW. 2021-06-05 03:29:44 +03:00
levlam
1ab2f9fe9d Improve maximize_buffer. 2021-06-03 04:11:11 +03:00
levlam
8db4febd4c Minor improvements. 2021-06-02 15:43:56 +03:00
levlam
dd687b2f82 Remove superflous const qualifier. 2021-06-02 05:21:15 +03:00
levlam
9cecc116f3 Prefer US spelling of "canceled". 2021-05-31 21:51:48 +03:00
Arseny Smirnov
fb2c664f03 Add missed #include<algoritm> 2021-05-28 10:14:51 +00:00
Andrea Cavalli
2c77e82300 Merge remote-tracking branch 'td/master' into dev 2021-05-27 00:50:41 +02:00
levlam
aaba82f5c5 Improve checks in parse_url. 2021-05-26 01:20:49 +03:00
levlam
90e253d90c Remove REGISTER_TESTS define. 2021-05-26 00:41:15 +03:00
levlam
5f0b24926f Split path in HttpUrlQuery. 2021-05-25 04:39:41 +03:00
levlam
200da2c684 Add parse_url_query. 2021-05-24 23:47:18 +03:00
levlam
e1ebf74398 Fix CE. 2021-05-21 02:05:03 +03:00
levlam
bb957644cf Add td_api::backgroundFillFreeformGradient. 2021-05-21 01:49:59 +03:00
levlam
5e7adcd1cb Don't include SliceBuilder.h in Status.h. 2021-05-20 23:13:02 +03:00
levlam
7edffa1bc7 Move TsLog out of logging.h. 2021-05-18 17:41:33 +03:00
levlam
df4c4b9471 Move TsCerr to separate header. 2021-05-18 17:24:32 +03:00
levlam
674a112bfa Add NullLog.h. 2021-05-18 17:13:26 +03:00
levlam
f72195baab Remove TC_* defines. 2021-05-18 16:55:35 +03:00
levlam
d34680b83f Remove set_log_fatal_error_callback. Add td_set_log_message_callback, deprecate td_set_log_fatal_error_callback. 2021-05-18 04:41:09 +03:00
levlam
3b0e2f5e85 Added the ability to hook into logging system. 2021-05-17 18:49:09 +03:00
levlam
8231c58335 Rename LogInterface::rotate to after_rotation. 2021-05-17 17:58:33 +03:00
levlam
fdeaafa70d tg_cli: always write log to file. 2021-05-17 17:33:26 +03:00
levlam
135f9de4a9 Add CombinedLog.h. 2021-05-17 16:53:35 +03:00
levlam
13a21b4fe2 Make LogInterface::append non-virtual. 2021-05-17 16:18:19 +03:00
levlam
a6a4eb6616 Don't include SliceBuilder.h in logging.h. 2021-05-17 15:21:11 +03:00
levlam
17a1015f6b Remove dependency of PSLICE/PSTRING on Logger, move them to separate header and make them always safe. 2021-05-17 03:24:54 +03:00
levlam
29230948c3 Remove redundant LogInterface::rotate overrides. 2021-05-17 02:04:50 +03:00
levlam
083d599c41 Support stacktrace printing on Windows. 2021-05-11 19:27:37 +03:00
Andrea Cavalli
40048f12ca Merge 2021-05-04 22:17:39 +02:00
levlam
b342ec33e5 Likely add Solaris support. 2021-04-30 02:34:12 +03:00
levlam
f00d562c5b Silence expected warning. 2021-04-30 01:26:02 +03:00
levlam
e1fc85d610 Print warnings about unsupported OS/compiler only once. 2021-04-30 01:24:42 +03:00
Joshua M. Clulow
ed291840d3
add illumos support (#1501) 2021-04-29 16:40:08 +03:00
Andrea Cavalli
799d106c49 Merge remote-tracking branch 'td/master' 2021-04-10 19:44:10 +02:00
levlam
564b44d3b9 Fix ifdef check. 2021-04-08 22:17:55 +03:00
levlam
6e099908cf Don't use sendmsg on Android. 2021-04-08 14:55:54 +03:00
levlam
9bb79b4b27 Ignore invalid Unicode strings in C++/CX. 2021-04-08 14:43:47 +03:00
levlam
02c9caafc0 Fix FromApp building for UWP. 2021-04-04 23:40:05 +03:00
Andrea Cavalli
ae6ef91da2 Merge commit 'c36ed586e25eb9c3f822d595be2b0ef83a2b9fbc' 
Conflicts:
	td/telegram/MessagesManager.cpp
 2021-04-04 16:37:10 +02:00
levlam
c36ed586e2 Fix MoveFileExFromAppW. 2021-04-04 02:58:59 +03:00
levlam
2ab94b9ca7 Add checks that SocketFd::read/write/writev return correct response. 2021-04-04 01:08:53 +03:00
levlam
e246201cf0 Add checks that FileFd::read/write/pread/pwrite/writev return correct response. 2021-04-04 00:47:30 +03:00
levlam
6285d98479 Fix writev on Windows. 2021-04-04 00:40:37 +03:00
Andrea Cavalli
1ce823b0e6 Merge commit '1bbcc01091c8ca92f79821790b8857edb5a1b6b4' 2021-04-03 12:53:29 +02:00
levlam
40740597f7 Add ChainBufferReader::advance debug. 2021-04-02 16:30:10 +03:00
Arseny Smirnov
a51b63afdd more checks for watch os version 2021-03-29 16:26:11 +03:00
levlam
4df03c8491 Clamp float numbers before conversion to integers. 2021-03-28 22:33:22 +03:00
Andrea Cavalli
0c653e2526 Merge commit 'fbc7e5a7f845d6c8df12b11f5b9a5c9ffc6eea0e' 2021-03-28 12:57:26 +02:00
Arseny Smirnov
5c7b7d4c85 TD_EXPERIMENTAL_WATCH_OS cmake option 2021-03-26 18:04:25 +03:00
Andrea Cavalli
78291a96d4 Merge commit '70b71d569b81c66b25f8f77d9536b1d41fbf091d' 2021-03-21 01:04:45 +01:00
levlam
1c92315439 Fix lpad0 signature. 2021-03-15 18:39:02 +03:00
Andrea Cavalli
4a1b295baa Undo breaking database modifications, add tl-parser 2021-03-12 12:31:51 +01:00
Andrea Cavalli
1ea79d2739 Merge latest commits 2021-03-11 18:25:39 +01:00
Arseny Smirnov
0c90ca3784 some cryptography draft 2021-02-10 23:25:28 +03:00
levlam
e031a2c6c1 Improve Slice::truncate usage. 2021-02-04 15:54:12 +03:00
levlam
9e37c85af3 Minor improvements. 2021-01-27 02:57:59 +03:00
Andrea Cavalli
a79f835de0 Add memory_cleanup on tear_down, and add more memory_cleanup. 2021-01-12 01:37:17 +01:00
Andrea Cavalli
2e5d5a81bc Merge commit '62c18729f1cf8c5f1b7dc6f0d37edbffd2bb78b5' 2021-01-07 19:38:10 +01:00
levlam
62c18729f1 Fix td::unique. 2021-01-07 04:03:38 +03:00
Andrea Cavalli
85fb357a19 Merge commit '82f0386e73b7128a8aafec5bfa7dd825fe94ac39' 
Conflicts:
	td/telegram/MessagesManager.cpp
 2021-01-02 12:57:08 +01:00
levlam
82f0386e73 Move some functions from misc.h to algorithm.h. 2021-01-01 16:01:03 +03:00
levlam
52c1da0a70 Update copyright year. 2021-01-01 15:57:46 +03:00
levlam
677f4f6103 Add missing license. 2021-01-01 01:33:43 +03:00
levlam
192fd4862f Use td::unique. 2020-12-30 18:50:57 +03:00
levlam
18be33a18c Add td::unique helper method. 2020-12-30 18:17:22 +03:00
levlam
fc2941763b Fix LibreSSL 3+ support. 2021-01-24 21:59:03 +03:00
Andrea Cavalli
17e7e44f6e Merge commit '8139e0d560b25cd2827fb0473e5726319998c10f' 
Conflicts:
	td/generate/scheme/td_api.tlo
	td/telegram/GroupCallManager.cpp
	td/telegram/MessagesManager.cpp
 2020-12-28 19:09:04 +01:00
levlam
3c5c23aeec Improve error message. 2020-12-26 20:25:59 +03:00
Andrea Cavalli
3817c4f634 Merge remote-tracking branch 'td/master' 2020-12-25 20:29:10 +01:00
levlam
c1a1fc881c Fix BufferedStdinImpl destruction. 2020-12-24 20:49:08 +03:00
levlam
47e413e0b8 Fix BufferedStdinImpl reference counter. 2020-12-24 19:17:06 +03:00
levlam
b582eb346a Undo move_as_native_fd changes. 2020-12-24 18:43:26 +03:00
levlam
1b92e2d57a Return back ScopeExit usage. 2020-12-24 17:16:56 +03:00
levlam
c1a16acd53 Don't check that Stdin/Stdout/Stderr are unlocked on exit. 2020-12-24 17:12:50 +03:00
levlam
0787c642ce Fix dlog_print usage on Tizen. 2020-12-23 19:38:58 +03:00
levlam
d628f9fa02 FromApp method fixes. 2020-12-23 18:08:34 +03:00
Fela Ameghino
7c14b3b881
Use *FromApp methods when available (#1303) 2020-12-23 11:25:27 +03:00
levlam
7d1e5bca55 Reimplement HMAC for OpenSSL 3.0.0. 2020-12-22 19:32:57 +03:00
levlam
abdc727a0f Improve OpenSSL 3.0 compatibility. 2020-12-22 17:46:56 +03:00
Andrea Cavalli
3c59d917be Merge remote-tracking branch 'td/master' 2020-11-23 17:27:14 +01:00
levlam
a093d36b3f Better fix for ThreadIdGuard destroy after exit. 2020-11-23 00:57:52 +03:00
levlam
4b687582c1 Do not try to use ThreadIdManager after exit. 2020-11-23 00:38:16 +03:00
Andrea Cavalli
cba9f74cba Merge remote-tracking branch 'td/master' 2020-11-22 01:11:21 +01:00
levlam
77de5110f5 Ensure that Time::now never returns negative time. 2020-11-21 20:33:15 +03:00
levlam
6ae33a5c27 Fix OptionParser test on Windows. 2020-11-20 03:33:09 +03:00
levlam
57de0c4967 Fix some warnings. 2020-11-20 03:11:27 +03:00
levlam
34cf869c02 Don't use EVP_aes_256_ctr before OpenSSL 1.1.0. 2020-11-20 02:18:12 +03:00
Andrea Cavalli
e4bcc81ec7 Merge commit '00abe2f4019717c6479e30c588059a3cfd3be58e' 
Conflicts:
	td/generate/scheme/td_api.tlo
 2020-11-14 11:11:47 +01:00
levlam
15b1543e20 Implement OS detection in Emscripten. 2020-11-13 18:04:16 +03:00
Andrea Cavalli
f81d11a0b3 Merge commit '6a2dba9e8c1a896ba5a14b1205a3784c057c86fd' 2020-11-11 19:54:04 +01:00
levlam
6a2dba9e8c Disable IPV6_V6ONLY on IPv6 server sockets on Windows. 2020-11-10 23:08:54 +03:00
Andrea Cavalli
cbe8d94183 Merge commit '1fa87babb32ea85ff5a97ab93525ae13f66a0eef' 2020-11-10 12:42:50 +01:00
levlam
7febd4f9af Support binding of ServerSocket to IPv6 address. 2020-11-10 00:50:05 +03:00
Andrea Cavalli
604df72790 Merge commit '1d75237893c8a08d73ba95a7e76b8da517b8c1dc' 2020-11-08 23:49:01 +01:00
levlam
f9a600c401 Minor fixes. 2020-11-08 14:00:36 +03:00
Andrea Cavalli
6f28ad36af Merge commit '60edadab90d7aeb8d7a44764344b8848abf5b8bb' 
Conflicts:
	td/telegram/MessagesManager.cpp
 2020-11-07 23:10:26 +01:00
levlam
431b0bddbc Fix GCC warning. 2020-11-06 18:27:33 +03:00
levlam
7e82a54417 Fix std::is_trivially_copyable usage. 2020-11-06 18:27:19 +03:00
Andrea Cavalli
1f7c4e2508 Remove death_handler 2020-11-06 14:27:05 +01:00
Andrea Cavalli
8c8b10541d Typo 2020-11-06 12:17:44 +01:00
Andrea Cavalli
423d05f18e Remove death handler if using musl 2020-11-05 21:58:40 +01:00
Andrea Cavalli
16f41643ed Merge commit '821398fa211b6a3c53733ccf271ee7a783d9bc75' 
Conflicts:
	.gitignore
	td/generate/scheme/td_api.tlo
	td/telegram/ContactsManager.h
 2020-11-04 20:05:50 +01:00
Andrea Cavalli
2e31ced59b Update to tdlib 1.6.10 2020-11-04 20:03:14 +01:00
levlam
c1de6a7d8d Minor improvements. 
GitOrigin-RevId: eb8b201d80405feb6972b2eabc7de30d40aa8b81
 2020-11-02 00:43:57 +03:00
levlam
36763888d4 Improve Usage output in OptionParser. 
GitOrigin-RevId: 8955f6ce0643fbf871b3f3781bd36568d490eb6c
 2020-11-01 01:28:58 +03:00
levlam
da6d1d8d74 Add rpad. 
GitOrigin-RevId: 5dbc3667ef3e4ffd35cce4a358b3b986ec9bd8f4
 2020-10-30 16:21:13 +03:00
Andrea Cavalli
134d20b7ec Merge commit 'bf945e05be9a9f696bdd866cc3427ac1bc7a4825' 2020-10-26 21:55:16 +01:00
levlam
989491466d Add lpad function. 
GitOrigin-RevId: d23ef15d200e2b199294de0d10a10e92d7389339
 2020-10-22 12:22:35 +03:00
levlam
1ad0b068cd Improve oneline. 
GitOrigin-RevId: 6cec8e407f0f5eedb367aea25864033a69e1d1e5
 2020-10-22 12:09:32 +03:00
Andrea Cavalli
17230da76a Merge commit 'cecdae448e88603c98d7d079855c992be6df739f' 2020-10-20 23:20:56 +02:00
levlam
fa91220f88 Remove superflous "struct " specifiers. 
GitOrigin-RevId: 317d66fad270e99c4c4e6bc14b172f4c2eec3d6d
 2020-10-18 18:29:51 +03:00
levlam
fc5bf9ef06 Suppress SIGPIPE signals on write. 
GitOrigin-RevId: 19ff2a079a4dc69535e34282bfb2c2f381856def
 2020-10-18 18:12:32 +03:00
Andrea Cavalli
85bf271fb8 Update Client.cpp, Log.cpp, and 4 more files... 2020-10-12 19:50:17 +02:00
Andrea Cavalli
fc5b0e9d06 Merge commit '6b1f6b829d0d71f5d50662b1ff58b7869c1e1d7f' 
Conflicts:
	td/telegram/Client.cpp
	td/telegram/cli.cpp
 2020-10-12 16:15:14 +02:00
Andrea Cavalli
0da9b62eda Merge commit '7207d76a809598d019e17fb04b2edc46789c6e22' 
Conflicts:
	td/telegram/Client.cpp
 2020-10-12 16:12:59 +02:00
Andrea Cavalli
f423fc0d81 Merge commit '35a9a93fc9adfbced4d5f59baf0c72a2f807f28a' 
Conflicts:
	td/telegram/Client.cpp
	td/telegram/StickersManager.cpp
	td/telegram/WebPagesManager.cpp
 2020-10-12 16:10:48 +02:00
Andrea Cavalli
ef9e05a805 Merge commit '1cfa7545c938212b8976eafe3055fe161b8fd7c4' 
Conflicts:
	td/telegram/Client.cpp
 2020-10-12 16:05:01 +02:00
Andrea Cavalli
2b69eef4a5 Merge commit 'd87558177241862f7db1b934f8a211b94180f28b' 
Conflicts:
	td/telegram/Client.cpp
 2020-10-12 15:59:54 +02:00