ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-04 05:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
339 Commits 3 Branches 294 Tags
Commit Graph

339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Laktyushin
c2a3f2e65b Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-12 08:46:56 +01:00
Peter
4f35f73243 Merge commit '311d9ac073d8c4ffd8bcea7041000ac9e8d03128' 2018-09-11 22:21:03 +03:00
Peter
0648840a26 no message 2018-09-11 22:20:43 +03:00
overtake
311d9ac073 no message 2018-09-11 19:04:11 +01:00
overtake
81c9d6ec1c Merge branches 'master' and 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-11 17:28:11 +01:00
overtake
674465dd01 no message 2018-09-11 17:27:53 +01:00
Ilya Laktyushin
546c6322d6 no message 2018-09-11 17:13:45 +01:00
Peter
3a414eeea2 Merge commit 'd4c685ebf812967f9286101ecfb94f6b12668818' 2018-09-11 00:44:37 +03:00
Peter
8072af014b Merge commit '542cea3d32876bd8a0db25212155a9385901a776' 2018-09-10 20:48:14 +03:00
overtake
d4c685ebf8 no message 2018-09-10 17:04:45 +01:00
Peter
c6cf803dc5 no message 2018-09-10 18:00:01 +03:00
overtake
542cea3d32 no message 2018-09-10 10:32:50 +01:00
overtake
111afb601d Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-09 11:20:18 +01:00
overtake
6295e0e610 no message 2018-09-09 11:20:05 +01:00
Peter
acd863f780 no message 2018-09-09 00:44:06 +03:00
Peter
54f4ffdac9 no message 2018-09-08 01:55:22 +03:00
Peter
0edc7415d7 Merge commit 'ac56816f4ca24b292d1df9798010ec394df4c513' 
# Conflicts:
#	TelegramUI/PeerChannelMemberCategoriesContextsManager.swift
 2018-09-07 23:01:42 +03:00
Peter
b04ddea9c5 no message 2018-09-07 22:55:14 +03:00
Ilya Laktyushin
ac56816f4c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 22:36:43 +03:00
Ilya Laktyushin
e35508a06c no message 2018-09-07 22:36:29 +03:00
overtake
97352aec85 no message 2018-09-07 19:58:25 +01:00
overtake
da6c1781b6 no message 2018-09-07 19:49:49 +01:00
Peter
1bde567623 no message 2018-09-07 14:26:46 +03:00
Peter
ba7ec36e0c Merge commit '2e5d6896a0adfc801eddd734ccb31fcfde77cc14' 
# Conflicts:
#	TelegramUI/UserInfoController.swift
 2018-09-07 01:33:23 +03:00
Ilya Laktyushin
2e5d6896a0 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 01:09:13 +03:00
Peter
b15ce8cc3b Merge commit 'b83248d844d7d3fc178843f1f9cdc607004a5c68' 2018-09-07 01:07:52 +03:00
Peter
290105e637 Merge commit '7e6cff6a16edf3b6a12b4625d7cbb734da7be559' 2018-09-07 01:07:32 +03:00
Peter
bf38d1a77f no message 2018-09-07 01:07:09 +03:00
Ilya Laktyushin
c6682b1bd9 no message 2018-09-07 01:04:54 +03:00
overtake
b83248d844 no message 2018-09-06 22:58:58 +01:00
Ilya Laktyushin
9fc21e5b5f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 00:37:49 +03:00
Ilya Laktyushin
43bbabfcbc no message 2018-09-07 00:35:43 +03:00
overtake
6b55ba645f no message 2018-09-06 22:22:31 +01:00
overtake
5788e272b7 no message 2018-09-06 22:00:57 +01:00
Ilya Laktyushin
1fc691a800 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-06 12:45:06 +03:00
overtake
7e6cff6a16 no message 2018-09-06 00:43:45 +01:00
overtake
a56b570d0f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 20:23:12 +01:00
Peter
58ac15c9ce no message 2018-09-05 22:22:03 +03:00
Peter
2a98afa983 no message 2018-09-05 22:09:47 +03:00
overtake
664a4d2d3c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 18:34:40 +01:00
overtake
025ef8094d no message 2018-09-05 18:31:59 +01:00
Peter
0b3b2caa4e no message 2018-09-05 20:00:58 +03:00
Ilya Laktyushin
2a432ddcf4 no message 2018-09-05 19:37:37 +03:00
Peter
7a114f229c no message 2018-09-05 19:00:52 +03:00
Ilya Laktyushin
bb69ec2997 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 13:24:06 +03:00
Ilya Laktyushin
258f992051 no message 2018-09-05 13:05:17 +03:00
Peter
cbde93981f no message 2018-09-05 03:03:41 +03:00
Ilya Laktyushin
0e4a540192 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI.xcodeproj/project.pbxproj
#	TelegramUI/ChatController.swift
#	TelegramUI/UserInfoController.swift
 2018-09-05 01:32:25 +03:00
Ilya Laktyushin
66de87a550 Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2' 
# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift
 2018-09-05 01:04:07 +03:00
overtake
54eb8f744e no message 2018-09-04 22:54:49 +01:00