20 Commits

Author SHA1 Message Date
Peter Iakovlev
1cd169f5fe Updated chat list reset 2018-12-25 17:57:06 +04:00
Peter
0f42fde3f5 no message 2018-09-07 22:49:24 +03:00
Peter
42ca134f32 no message 2018-06-14 12:49:11 +03:00
Peter
8a6bfd44ea no message 2018-05-31 16:22:57 +03:00
Peter
ec6c3b451d no message 2018-05-20 23:10:26 +02: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
Peter
49725424bb Merge commit '96daa84432d97a8496fbe5eddae7cd84bf2132e9' 2017-06-16 12:16:06 +03:00
Peter
0100756ebf Merge commit '11eba885a4cf6dd7e379cebbf7343965a15c8a2c'
# Conflicts:
#	TelegramCore/ChannelParticipants.swift
2017-06-16 12:15:58 +03:00
overtake
96daa84432 no message 2017-06-14 21:16:53 +03:00
Peter
2bbad53f3f no message 2017-06-14 01:13:25 +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
e9093ccf99 Merge branch 'devel' of https://github.com/peter-iakovlev/TelegramCore into devel 2017-06-09 14:27:28 +03:00
Peter
26f4f3ebf9 no message 2017-06-09 13:38:12 +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
317c12a012 no message 2017-02-22 18:30:05 +03:00