311 Commits

Author SHA1 Message Date
Peter
d02b75a0c5 no message 2017-08-21 23:28:37 +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
overtake
157c5363e1 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-06-18 15:48:36 +03:00
Peter
76caa41f75 no message 2017-06-18 01:47:40 +03:00
overtake
5aa86ede1d admin reform 2017-06-16 21:18:52 +03:00
Peter
c77a13ce57 no message 2017-06-16 13:42:11 +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
11eba885a4 Merge commit '0a8559823e2909c1137ef2fb2802023960e66575' into devel 2017-06-13 22:01:57 +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
0a8559823e Merge branch 'devel' 2017-06-13 21:46:51 +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
overtake
707608391a changes 2017-06-09 14:27:16 +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
overtake
c2fbbfb93c fixes 2017-06-06 16:21:25 +03:00
Peter
7f96bd3f18 no message 2017-06-06 14:40:52 +03:00
Peter
b307f7d2d2 no message 2017-06-06 13:13:49 +03:00
Peter
70d51f5f7a no message 2017-06-06 12:47:22 +03:00
Peter
3157baa739 no message 2017-06-05 15:52:44 +03:00