122 Commits

Author SHA1 Message Date
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
Peter
d5ec231184 no message 2017-11-14 20:39:11 +03:00
Peter
00c3e87b11 no message 2017-10-10 18:42:50 +03:00
overtake
0671c33ab8 no message 2017-09-19 19:46:19 +03:00
Peter
9645d068bc no message 2017-09-19 15:17:16 +03:00
Peter
98632adefd no message 2017-09-11 00:07:36 +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
d02b75a0c5 no message 2017-08-21 23:28:37 +03:00
Peter
b0d55fdea7 no message 2017-08-15 14:45:34 +03:00
Peter
0d0c3fff9c no message 2017-07-14 15:26:25 +03:00
Peter
085ce892b0 no message 2017-06-27 17:18:08 +03:00
overtake
380f8518b6 no message 2017-06-20 18:03:22 +03:00
Peter
76caa41f75 no message 2017-06-18 01:47:40 +03:00
overtake
16c84c3d2a Merge branch 'devel' of https://github.com/peter-iakovlev/TelegramCore into devel
Conflicts:
	TelegramCore/ChannelAdmins.swift
	TelegramCore/ChannelBlacklist.swift
	TelegramCore/ChannelMembers.swift
	TelegramCore/ChannelParticipants.swift
2017-06-13 22:00:49 +03:00
Peter
93fe592eb9 no message 2017-06-13 21:45:17 +03:00
overtake
ef2035cd74 - admins reform 2017-06-09 05:57:18 +03:00
Peter
70d51f5f7a no message 2017-06-06 12:47:22 +03:00
Peter
7fc8503af5 Merge commit 'e328b1b736cf1903535d89a252eba0c3711b2f97' 2017-05-29 16:18:32 +03:00
Peter
6d17725856 no message 2017-05-29 16:18:00 +03:00
overtake
d918b53ab3 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
Conflicts:
	TelegramCore/EnqueueMessage.swift
	TelegramCore/TelegramMediaAction.swift
2017-05-26 13:20:06 +03:00
overtake
c7a8f89335 no message 2017-05-26 13:18:57 +03:00
Peter
ae7c0af98a no message 2017-05-26 13:11:25 +03:00
overtake
130d805562 no message 2017-05-16 19:02:37 +03:00
Peter
f43400df1f no message 2017-05-07 16:30:06 +03:00
overtake
ae9f0035fc sidebar 2017-05-02 14:36:42 +03:00
overtake
5ca27728d7 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-04-18 19:56:08 +03:00
Peter
dab8ab4dc5 no message 2017-04-18 19:53:10 +03:00
overtake
9e601319a1 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-04-14 16:06:10 +03:00
Peter
46a2ead614 no message 2017-04-14 16:04:42 +03:00
overtake
32d12c5940 no message 2017-04-13 19:42:08 +03:00
overtake
49f82c1096 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-04-08 18:16:47 +03:00
Peter
f747bb4716 no message 2017-04-08 17:23:13 +03:00
overtake
e3a8391c3c no message 2017-04-02 21:52:59 +03:00
Peter
71ff550bcc no message 2017-03-28 21:45:26 +03:00
Peter
c55a138e0b no message 2017-03-23 21:26:36 +03:00
overtake
4bd269e5ea no message 2017-03-21 20:01:04 +03:00
Peter
5278f451f1 no message 2017-03-21 19:58:26 +03:00
Peter
1ae775b2f4 no message 2017-03-21 14:37:37 +03:00
Peter
ee7d69819c no message 2017-03-18 17:58:07 +03:00
Peter
b90f3bc405 no message 2017-03-16 00:10:21 +03:00
Peter
8a2f76f328 no message 2017-03-15 13:32:53 +03:00
Peter
652832e32b Merge commit '3ca08f7aae8e4c108730926be5954d371b4d5ef7'
# Conflicts:
#	TelegramCore/StoreMessage_Telegram.swift
2017-03-14 17:22:32 +03:00
Peter
b7bd388ff4 no message 2017-03-14 17:21:25 +03:00
overtake
678236b6bc - no message 2017-03-10 21:43:11 +03:00
Peter
f5c7871b05 no message 2017-03-08 01:03:20 +03:00
Peter
976f82204d Merge commit 'c63302459dbfd7c543b9bd7260f53eb3c34bacb6' 2017-03-07 15:58:40 +03:00