ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-03 21:16:35 +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
d568c38587 no message 2018-09-25 21:03:30 +01:00
Peter
8d03477771 no message 2018-09-25 17:59:02 +01:00
Peter
dc12e079a3 Merge commit '4c028908e1f06084a5a41e74001efe20cae52d46' 
# Conflicts:
#	TelegramUI/SecureIdAuthControllerNode.swift
#	TelegramUI/SecureIdAuthFormFieldNode.swift
 2018-09-25 16:42:03 +01:00
Peter
9588da80b1 no message 2018-09-25 16:23:14 +01:00
Ilya Laktyushin
4c028908e1 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-25 12:29:58 +01:00
Ilya Laktyushin
92d95510c7 no message 2018-09-25 12:29:53 +01:00
Peter
1f29ac5f27 Merge commit 'cb30aa60a85dd2083fa5203491a94690013f7fbf' 
# Conflicts:
#	TelegramUI/PresenceStrings.swift
 2018-09-25 01:38:02 +01:00
Peter
97fc5d83e1 no message 2018-09-25 01:36:44 +01:00
Ilya Laktyushin
f3c966308f no message 2018-09-24 17:22:43 +01:00
Ilya Laktyushin
a61a29f6f6 no message 2018-09-24 17:18:34 +01:00
Ilya Laktyushin
cb30aa60a8 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-23 14:46:54 +01:00
Ilya Laktyushin
53ec081c05 no message 2018-09-23 14:46:45 +01:00
Peter
c55d7615a3 Merge commit '91a7d1271a59ec1e59f1379309c25da9ce87d9c9' 2018-09-23 00:18:38 +01:00
Peter
8afe773e02 no message 2018-09-23 00:18:33 +01:00
overtake
91a7d1271a no message 2018-09-21 18:25:03 +01:00
Ilya Laktyushin
26a8b5e72f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-21 09:07:45 +01:00
Ilya Laktyushin
f7963c166c no message 2018-09-21 09:04:02 +01:00
Peter
4e7b02568e Merge commit 'f82e4c1c7cb2aeea71aff222ec247eae880960b6' 2018-09-20 22:32:09 +01:00
Peter
f45ddf449d no message 2018-09-20 22:32:04 +01:00
Ilya Laktyushin
f82e4c1c7c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-20 21:29:50 +01:00
Ilya Laktyushin
8f258abf28 no message 2018-09-20 21:26:13 +01:00
Peter
92b501ae13 no message 2018-09-20 21:26:09 +01:00
Peter
86d8e59ad8 Merge commit 'c6a489edf8b50a3b7aa015e2a6a090d7d4a918fb' 2018-09-20 00:11:15 +01:00
Peter
f990f3f8bc no message 2018-09-19 01:07:09 +01:00
overtake
c6a489edf8 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-18 22:34:52 +01:00
overtake
70a5dd01d2 no message 2018-09-18 22:34:24 +01:00
Ilya Laktyushin
c925e514d9 no message 2018-09-18 20:34:24 +01:00
Ilya Laktyushin
ee3f81ed27 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-18 17:54:26 +01:00
Ilya Laktyushin
11c9b86287 no message 2018-09-18 17:54:21 +01:00
Peter
90f157419f no message 2018-09-18 17:49:52 +01:00
Ilya Laktyushin
78dca463ea no message 2018-09-17 22:08:09 +01:00
Ilya Laktyushin
5e092c8bf5 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-17 20:38:23 +01:00
Ilya Laktyushin
8407cd1c5f no message 2018-09-17 20:38:17 +01:00
Peter
7090bf6e2c no message 2018-09-17 20:31:46 +01:00
Peter
8ae83aef19 Merge commit 'c2ec64d81383c1f89b1bb62bd28a1a0ae4505d17' 2018-09-17 19:17:14 +01:00
Peter
dd4ed9c23d no message 2018-09-17 19:16:39 +01:00
overtake
c2ec64d813 no message 2018-09-17 19:05:02 +01:00
Peter
e2fc5ace75 no message 2018-09-15 00:39:38 +03:00
Ilya Laktyushin
c2149ecd2e Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-14 18:15:39 +01:00
Ilya Laktyushin
ff816dd8e3 no message 2018-09-14 18:15:30 +01:00
Peter
ba53cb714d no message 2018-09-14 19:54:11 +03:00
Peter
71b11564d2 Merge commit '55933acebca3b2361f8c2748a9f236bf98bb793d' 2018-09-14 18:37:29 +03:00
Peter
c8619024fe no message 2018-09-14 18:36:46 +03:00
Ilya Laktyushin
55933acebc Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-14 15:50:41 +01:00
Ilya Laktyushin
cf0d37b2aa Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI/SecureIdDocumentFormControllerNode.swift
 2018-09-14 15:50:23 +01:00
Peter
bdb87523be no message 2018-09-14 17:29:49 +03:00
Ilya Laktyushin
b090612e53 no message 2018-09-14 15:25:48 +01:00
Peter
6a039d5f43 Merge commit '7ec24554d4a73ada3c6691b999dfe24e7637b503' 2018-09-14 17:03:23 +03:00
Peter
144450d295 no message 2018-09-12 18:46:11 +03:00
Ilya Laktyushin
7ec24554d4 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI/SecureIdAuthFormFieldNode.swift
 2018-09-12 16:35:27 +01:00