65 Commits

Author SHA1 Message Date
Ilya Laktyushin
8ed80cf42e no message 2018-10-06 00:51:01 +03:00
Peter
d7ff3e80fa no message 2018-09-25 01:36:14 +01:00
Peter
01ed96e839 no message 2018-08-14 12:56:40 +03:00
Peter
827f23b20d no message 2018-06-29 20:16:58 +03:00
Peter
760861b8d2 no message 2018-06-15 21:57:40 +03:00
Peter
42ca134f32 no message 2018-06-14 12:49:11 +03:00
Peter
4c2f395ee6 no message 2018-06-08 19:28:27 +03:00
Peter
0acc1c2c89 no message 2018-06-05 13:31:08 +03:00
Peter
849299fdcf no message 2018-06-03 00:09:59 +03:00
Peter
4c87427ade no message 2018-06-02 03:13:42 +03:00
Peter
5aff913b59 Merge branch 'quickfix-25-05' into quickfix-01-06
# Conflicts:
#	TelegramCore.xcodeproj/project.pbxproj
#	TelegramCore/Api3.swift
#	TelegramCore/TermsOfService.swift
2018-06-01 12:42:15 +03:00
Peter
8a6bfd44ea no message 2018-05-31 16:22:57 +03:00
Peter
c265e81118 no message 2018-05-25 11:31:59 +02:00
Peter
b436bb2641 no message 2018-05-11 21:36:59 +03:00
Peter
727d185a01 no message 2018-05-03 14:03:15 +03:00
Peter
8b67c9ba75 Merge commit '6852a30f95e30d06d8e29de4372a3f5c0bfae5dc' into feature/secureid 2018-05-02 22:52:10 +03:00
Peter
87bc6849af no message 2018-05-02 22:52:05 +03:00
Mikhail Filimonov
6852a30f95 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-05-01 20:59:19 +04:00
Peter
b6d2a10d12 no message 2018-05-01 14:47:16 +03:00
Mikhail Filimonov
c36925e399 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-04-27 18:00:22 +04:00
Peter
6009a9756c no message 2018-04-26 19:38:48 +03:00
Mikhail Filimonov
d42d2847ed Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-04-24 21:06:39 +04:00
Peter
b39810b9c1 no message 2018-04-24 19:47:55 +03:00
Mikhail Filimonov
81add5e040 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid
# Conflicts:
#	TelegramCore/ProxySettings.swift
2018-04-23 14:52:09 +04:00
Mikhail Filimonov
55942e503f Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid
# Conflicts:
#	TelegramCore/ProxySettings.swift
2018-04-21 13:08:06 +04:00
Peter Iakovlev
1fb868b9ff no message 2018-04-20 23:33:21 +04:00
Peter Iakovlev
66443493c0 no message 2018-04-20 14:25:10 +04:00
Peter Iakovlev
e6721adc80 no message 2018-04-20 14:24:17 +04:00
Peter Iakovlev
b081acd134 no message 2018-04-20 13:17:30 +04:00
Peter Iakovlev
abd8b9eb43 no message 2018-04-18 19:27:06 +04:00
Peter Iakovlev
0d3e30c7c9 no message 2018-01-28 20:02:12 +04:00
Peter
fb6412e86d no message 2018-01-02 14:08:55 +04:00
Peter
a1cb78b75b no message 2017-12-28 21:06:28 +04:00
Peter
f43e0ad143 no message 2017-12-21 16:45:01 +04:00
Peter
d5ec231184 no message 2017-11-14 20:39:11 +03:00
Peter
98632adefd no message 2017-09-11 00:07:36 +03:00
Peter
e3a70b659f no message 2017-07-17 21:14:02 +03:00
Peter
5431b6dbdc Merge commit '29826304da68627132891a947757662b03e68ad8' 2017-07-14 15:26:30 +03:00
Peter
0d0c3fff9c no message 2017-07-14 15:26:25 +03:00
overtake
03ca5b741c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-06-27 19:24:27 +03:00
Peter
085ce892b0 no message 2017-06-27 17:18:08 +03:00
overtake
66a24fb35a no message 2017-06-22 09:41:38 +01:00
Peter
8bff370825 no message 2017-06-21 14:46:51 +03:00
Peter
76caa41f75 no message 2017-06-18 01:47:40 +03:00
Peter
3eb82bc3dc no message 2017-05-26 16:00:52 +03:00
Peter
ae7c0af98a no message 2017-05-26 13:11:25 +03:00
overtake
47df0e451a Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-04-20 18:58:36 +03:00
Peter
50979d69c3 no message 2017-04-20 18:58:02 +03:00
overtake
c5cc1d22ea no message 2017-04-20 18:46:18 +03:00
Peter
dab8ab4dc5 no message 2017-04-18 19:53:10 +03:00