533 Commits

Author SHA1 Message Date
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
overtake
5114f12d9a no message 2017-08-18 18:06:44 +03:00
overtake
3d9886e517 no message 2017-08-15 16:08:57 +03:00
overtake
eab2380e1b Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
Conflicts:
	TelegramCore/Holes.swift
	TelegramCore/SearchMessages.swift
2017-08-15 15:04:46 +03:00
overtake
8589b99e4f no message 2017-08-15 15:01:02 +03:00
Peter
8471016caf Merge commit 'd96ee19bf17337151fff6206a27afdcb3ec9c2db' 2017-08-15 14:45:39 +03:00
Peter
b0d55fdea7 no message 2017-08-15 14:45:34 +03:00
overtake
d96ee19bf1 no message 2017-07-21 16:28:58 +03:00
Peter
e3a70b659f no message 2017-07-17 21:14:02 +03:00
Peter
ab1267b7f6 Merge commit '0487414c7273e211aa68f4b9c621f33523990a17' 2017-07-17 20:42:13 +03:00
Peter
cef934468e no message 2017-07-17 20:41:58 +03:00
overtake
0487414c72 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-07-14 16:58:52 +03:00
overtake
13f9d5a0c5 no message 2017-07-14 16:58:45 +03:00
Peter
d8a8f02331 no message 2017-07-14 16:30:07 +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
29826304da no message 2017-06-29 17:51:15 +03:00
overtake
03ca5b741c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-06-27 19:24:27 +03:00
overtake
3ad694b9f2 no message 2017-06-27 19:24:21 +03:00
Peter
085ce892b0 no message 2017-06-27 17:18:08 +03:00
overtake
b54ff1ca73 themes 2017-06-23 21:19:47 +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
983796ee96 no message 2017-06-21 01:04:10 +03:00
Peter
5a6fb7ad85 Merge commit '380f8518b627d4b568be2683ac5b3cd894c3028d' 2017-06-21 01:03:24 +03:00
Peter
b159e56133 no message 2017-06-21 01:03:20 +03:00
overtake
380f8518b6 no message 2017-06-20 18:03:22 +03:00
overtake
e7ffd1fb3a no message 2017-06-19 20:39:27 +03:00
overtake
aae974a26a Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-06-19 20:39:14 +03:00
Peter
1248c2202c no message 2017-06-19 20:36:26 +03:00
overtake
d2734b02a7 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-06-19 15:51:38 +03:00
Peter
bbf72fbc93 no message 2017-06-18 16:26:07 +03:00