ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-24 14:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
533 Commits 3 Branches 281 Tags
Commit Graph

533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter
3c92d2bb15 no message 2017-06-05 13:53:22 +03:00
Peter
1ed46b9c28 no message 2017-05-29 18:08:18 +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
e328b1b736 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-26 16:01:36 +03:00
Peter
3eb82bc3dc no message 2017-05-26 16:00:52 +03:00
overtake
c7fc70b25d Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-26 15:42:16 +03:00
overtake
2c79703859 no message 2017-05-26 15:42:11 +03:00
Peter
7b0e9adbae no message 2017-05-26 15:32:46 +03:00
Peter
c0d98aae3b no message 2017-05-26 13:22:54 +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
dac79da63c Merge commit 'bdf58e46099925e437fa6535d8ed163044bca74f' 2017-05-26 13:11:37 +03:00
Peter
ae7c0af98a no message 2017-05-26 13:11:25 +03:00
overtake
74e063b835 - no message 2017-05-18 14:45:24 +03:00
overtake
130d805562 no message 2017-05-16 19:02:37 +03:00
overtake
bdf58e4609 secret chat bug fixes 2017-05-11 20:26:45 +03:00
overtake
8797d57d63 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-09 21:43:22 +03:00
Peter
f93eebb273 no message 2017-05-09 21:42:54 +03:00
overtake
ca711c2faf Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 
Conflicts:
	TelegramCore/CallSessionManager.swift
 2017-05-09 20:54:24 +03:00
Peter
14941cd075 no message 2017-05-09 20:50:23 +03:00
overtake
8ce65c669f Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-08 15:49:26 +03:00
Peter
fdc446ad10 no message 2017-05-08 15:37:12 +03:00
overtake
dc46d2a473 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-07 16:40:55 +03:00
Peter
f43400df1f no message 2017-05-07 16:30:06 +03:00
Peter
007b494e17 no message 2017-05-07 16:01:08 +03:00
overtake
72a0886de7 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-05-04 18:03:21 +03:00
overtake
7ae5a3ee98 no message 2017-05-04 18:03:15 +03:00