457 Commits

Author SHA1 Message Date
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
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