331 Commits

Author SHA1 Message Date
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
Peter
dfdc87bf95 no message 2017-09-26 03:00:53 +03:00
Peter
aed017e597 no message 2017-09-21 15:19:19 +03:00
Peter
d3d96d0fe1 Merge commit 'a03f9d45403f7ebc32db6625c80863c97531f28f' 2017-09-21 15:10:09 +03:00
Peter
d95f85e964 no message 2017-09-21 15:10:06 +03:00
overtake
a03f9d4540 Merge commit '0671c33ab8961a413478c698b5ea3befb889d83a'
* commit '0671c33ab8961a413478c698b5ea3befb889d83a':
  no message
  no message
2017-09-19 19:53:35 +03:00
overtake
3d2fb7f6a6 no message 2017-09-19 19:52:24 +03:00
overtake
4155b7bcd6 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-09-19 19:48:54 +03:00
overtake
0671c33ab8 no message 2017-09-19 19:46:19 +03:00
overtake
2bdbcca44e Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore into head
# Conflicts:
#	TelegramCore/Network.swift
#	TelegramCore/TelegramUser.swift
2017-09-19 19:08:33 +03:00
Peter
9645d068bc no message 2017-09-19 15:17:16 +03:00
overtake
21323a8325 Merge branch 'master' into HEAD 2017-09-15 16:13:09 +03:00
overtake
a1779a5467 no message 2017-09-15 16:12:52 +03:00
Peter
98632adefd no message 2017-09-11 00:07:36 +03:00
overtake
fd6a7623cb Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-09-06 11:15:34 +03:00
Peter
a0e2944be7 no message 2017-09-05 21:22:26 +03:00
overtake
e894b8d94a Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-09-01 21:42:36 +03:00
Peter
f48090e9eb no message 2017-09-01 19:08:10 +03:00
overtake
1cc32083a7 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-08-31 22:17:48 +03:00
overtake
a5007f1d49 no message 2017-08-31 22:17:40 +03:00
Peter
ca8eeb1b11 no message 2017-08-31 22:15:02 +03:00
Peter
611eb7d647 Merge commit 'f2edf323c83961332d40d650765e30b8e74ca216' 2017-08-31 16:19:10 +03:00
Peter
4da0f861e1 no message 2017-08-31 16:19:06 +03:00
overtake
f2edf323c8 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-08-29 17:21:11 +03:00
overtake
b3376cb619 no message 2017-08-29 17:21:04 +03:00
Peter
8fd5b0f7cc no message 2017-08-29 17:20:33 +03:00
Peter
d8200615c5 Merge commit '5114f12d9a3f04f2b2e770bebf5ccb2234fa776f' 2017-08-21 23:29:06 +03:00
Peter
d02b75a0c5 no message 2017-08-21 23:28:37 +03:00