Commit Graph

358 Commits

Author SHA1 Message Date
Peter Iakovlev
a3e8bb94de Merge commit '98ce66a7b411f98b924ff625ca86df62276159f0' 2018-01-12 17:30:21 +04:00
Peter Iakovlev
d04264c127 no message 2018-01-12 17:30:17 +04:00
Peter
98ce66a7b4 no message 2018-01-12 17:25:53 +04:00
Peter Iakovlev
15be8bb5e6 Merge commit 'b18b69a10f4729982db1264789ed33680fa8a422' 2018-01-12 15:45:45 +04:00
Peter Iakovlev
af30a6cc0e no message 2018-01-12 15:45:29 +04:00
Peter
b18b69a10f no message 2018-01-12 15:43:51 +04:00
Peter
abf0597ca9 no message 2018-01-12 15:36:50 +04:00
Peter Iakovlev
d93a30380e no message 2018-01-12 15:32:00 +04:00
Peter
872cfb102c no message 2018-01-11 22:44:15 +04:00
Peter
ecec26abd6 no message 2018-01-09 13:14:59 +04:00
Peter
12dac67c0b Merge branch 'groups' 2018-01-02 14:09:49 +04:00
Peter
ebe6de5f58 Merge commit '1a852fd26a235a10ef498fd6b8e13d4e8b49fa28'
# Conflicts:
#	TelegramCore/Authorization.swift
2018-01-02 14:09:43 +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
overtake
1a852fd26a reply 2017-12-27 13:57:01 +04:00
Peter
7940b80db9 no message 2017-12-21 18:05:40 +04:00
Peter
f43e0ad143 no message 2017-12-21 16:45:01 +04:00
overtake
f6327d72ae Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
  no message
2017-12-05 13:48:25 +04:00
overtake
3f9c97ca9f no message 2017-12-05 13:48:18 +04:00
Peter
8077d9561f no message 2017-12-05 13:47:45 +04:00
Peter
08c18539f2 no message 2017-12-05 13:46:00 +04:00
overtake
7c88878145 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
  no message
2017-12-01 15:28:31 +04:00
overtake
4b3eb8dc50 no message 2017-12-01 15:28:23 +04:00
Peter
9d2c9e0255 Merge commit 'c763c3db2e870bd3c90ca63b50be0f5869752105'
# Conflicts:
#	TelegramCore/Authorization.swift
2017-12-01 15:24:12 +04:00
Peter
d7bcb7a528 no message 2017-12-01 15:23:24 +04:00
Peter
89310ee56f no message 2017-12-01 15:22:22 +04:00
overtake
c763c3db2e no message 2017-11-28 19:32:51 +04:00
overtake
113d6edab4 no message 2017-11-22 14:22:57 +04:00
Peter
211d9d0aad no message 2017-11-21 20:33:01 +03:00
Peter
38b53b295b no message 2017-11-17 17:58:08 +03:00
Peter
055426240d Merge commit '5248afcb364bc4a81b593b2e667c5d206aa0ddd8' 2017-11-17 16:45:10 +03:00
Peter
327d29b16d no message 2017-11-17 16:44:51 +03:00
overtake
5248afcb36 no message 2017-11-17 17:44:15 +04:00
overtake
6fafcf3e13 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
2017-11-16 19:21:06 +04:00
overtake
4f6b69fbde no message 2017-11-16 19:21:00 +04:00
Peter
f5f5f058f8 no message 2017-11-16 18:13:01 +03:00
overtake
084d7d9170 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
2017-11-14 22:02:38 +04:00
overtake
62fe9141ba no message 2017-11-14 22:02:32 +04:00
Peter
00d05e7a5f Merge commit 'dbc32ce11f303c157843d075f24dc71c644ea156' 2017-11-14 20:39:15 +03:00
Peter
d5ec231184 no message 2017-11-14 20:39:11 +03:00
overtake
dbc32ce11f no message 2017-10-18 18:44:56 +03:00
overtake
e64dd27201 no message 2017-10-12 14:53:08 +03:00
overtake
f00b22b95c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
2017-10-11 00:21:39 +03:00
Peter
3d22de605d no message 2017-10-11 00:18:55 +03:00
overtake
6809b44ba5 no message 2017-10-11 00:16:01 +03:00
Peter
681cb0b5b8 Merge commit 'db106d206bf983e6921432be00bd0c4bf5cda64b'
# Conflicts:
#	TelegramCore/ContactManagement.swift
2017-10-10 18:43:48 +03:00
Peter
00c3e87b11 no message 2017-10-10 18:42:50 +03:00
overtake
db106d206b no message 2017-10-09 13:59:35 +03:00
overtake
33c6d65e5c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
2017-09-27 16:26:38 +03:00
overtake
9c8fba0831 no message 2017-09-27 16:26:15 +03:00