13 Commits

Author SHA1 Message Date
overtake
38f04aff40 Merge commit '42ca134f327a1ca219f5561142075d6c37a78ce2' into feature/secureid
# Conflicts:
#	TelegramCore/RequestChatContextResults.swift
2018-06-14 12:51:10 +03:00
Peter
42ca134f32 no message 2018-06-14 12:49:11 +03:00
overtake
2b1d560c66 no message 2018-06-05 20:09:03 +03:00
Peter
00c3e87b11 no message 2017-10-10 18:42:50 +03:00
overtake
96daa84432 no message 2017-06-14 21:16:53 +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
overtake
acaf6f359d no message 2017-06-13 21:47:29 +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
overtake
c2fbbfb93c fixes 2017-06-06 16:21:25 +03:00
Peter
b307f7d2d2 no message 2017-06-06 13:13:49 +03:00
Peter
317c12a012 no message 2017-02-22 18:30:05 +03:00
Peter
b076cf4dd1 no message 2017-02-19 23:20:10 +03:00