Commit Graph

468 Commits

Author SHA1 Message Date
Mikhail Filimonov
e91ca3f86b no message 2018-03-28 22:13:42 +04:00
Mikhail Filimonov
e425c69db4 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-28 16:01:41 +04:00
Peter Iakovlev
152a139727 no message 2018-03-28 15:01:20 +04:00
Peter Iakovlev
671fb6dd7e no message 2018-03-27 12:58:03 +04:00
Peter Iakovlev
33cc8132be no message 2018-03-27 12:03:39 +04:00
Peter Iakovlev
d67854a097 no message 2018-03-23 03:11:22 +04:00
Peter Iakovlev
bd1ab209ab no message 2018-03-21 00:58:01 +04:00
Mikhail Filimonov
c1f26363fd Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-21 00:01:24 +04:00
Peter Iakovlev
2bf793676c no message 2018-03-20 23:10:46 +04:00
Mikhail Filimonov
6ad54f3920 Merge branch 'master' into feature/secureid
# Conflicts:
#	TelegramCore.xcodeproj/project.pbxproj
2018-03-20 17:02:27 +04:00
Mikhail Filimonov
bb0c2da7b7 no message 2018-03-20 17:02:06 +04:00
Peter Iakovlev
257a4bac1b no message 2018-03-20 16:43:29 +04:00
Peter Iakovlev
5eeaed40c2 no message 2018-03-20 16:08:15 +04:00
Mikhail Filimonov
adcfd33024 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 2018-03-13 23:44:00 +04:00
Peter Iakovlev
3426ba2972 no message 2018-03-13 22:44:44 +04:00
Mikhail Filimonov
ecedf6a817 no message 2018-03-13 22:41:16 +04:00
Mikhail Filimonov
a2094a07ec Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev
# Conflicts:
#	TelegramCore/SearchMessages.swift
2018-03-13 22:19:31 +04:00
Mikhail Filimonov
b000e1d943 no message 2018-03-13 22:18:22 +04:00
Peter Iakovlev
088674abd0 no message 2018-03-13 22:14:18 +04:00
Peter Iakovlev
bfe30a0f9c no message 2018-03-13 21:40:16 +04:00
Peter
96a5ec6ecc no message 2018-03-12 22:53:08 +04:00
Mikhail Filimonov
94931f7f6f Merge commit 'a277b328f8b883093e8331e819ad7196945d3264' into group_calls 2018-03-07 21:32:02 +04:00
Mikhail Filimonov
da55972d05 no message 2018-03-07 18:36:29 +04:00
Peter
a277b328f8 no message 2018-03-07 15:21:40 +01:00
Mikhail Filimonov
06f36dc334 Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-03-03 20:39:59 +04:00
Peter Iakovlev
6e86980cd2 no message 2018-03-03 01:27:13 +04:00
Mikhail Filimonov
b3c405113d Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-03-02 20:56:43 +04:00
Mikhail Filimonov
344cc07236 no message 2018-03-02 20:56:24 +04:00
Peter Iakovlev
349953a84b no message 2018-03-02 20:54:55 +04:00
Mikhail Filimonov
b55d22f2fa Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-03-01 19:37:42 +04:00
Mikhail Filimonov
a835c4c4ee no message 2018-03-01 19:37:35 +04:00
Peter Iakovlev
22a05174d7 no message 2018-03-01 19:22:16 +04:00
Mikhail Filimonov
c353091c51 Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-03-01 12:34:09 +04:00
Mikhail Filimonov
e2d2bd98f9 no message 2018-03-01 12:33:58 +04:00
Peter Iakovlev
3306b36ddb no message 2018-03-01 03:54:11 +04:00
Peter Iakovlev
a4692499c4 no message 2018-02-28 01:19:26 +04:00
Mikhail Filimonov
1b6167bab7 Merge branches 'group_calls' and 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-02-26 19:36:08 +04:00
Mikhail Filimonov
9f2150f592 no message 2018-02-26 19:35:57 +04:00
Peter Iakovlev
78fdebcce3 no message 2018-02-26 15:23:09 +04:00
Peter Iakovlev
a3e4d97b6e Merge commit '84fcb8a8aafe0dafedf0876af3fad95b32a76f09' into group_calls 2018-02-26 15:15:58 +04:00
Peter Iakovlev
10a029df32 no message 2018-02-24 16:27:58 +04:00
Mikhail Filimonov
84fcb8a8aa no message 2018-02-21 03:22:15 +04:00
Mikhail Filimonov
9b898a23d5 Merge branch 'group_calls' of https://github.com/peter-iakovlev/TelegramCoreDev into group_calls 2018-02-12 22:36:18 +04:00
Mikhail Filimonov
7cfca503b0 no message 2018-02-12 22:36:11 +04:00
Peter Iakovlev
852c6b681b no message 2018-02-12 22:00:10 +04:00
Peter Iakovlev
309d0b84ad Merge commit 'cf4f84a1b78e324d59abf25f0965d219b354ca11' into group_calls
# Conflicts:
#	TelegramCore/Download.swift
#	TelegramCore/MultipartUpload.swift
#	TelegramCore/RecentAccountSessions.swift
2018-02-07 14:14:09 +04:00
Peter Iakovlev
f6c2a515df no message 2018-02-07 13:53:57 +04:00
Mikhail Filimonov
cf4f84a1b7 no message 2018-02-07 13:39:41 +04:00
Peter Iakovlev
86b74992f7 no message 2018-02-06 22:31:58 +04:00
Peter Iakovlev
64d878dfc3 no message 2018-02-05 19:32:26 +04:00