17 Commits

Author SHA1 Message Date
Peter
2f2ad75a6b no message 2018-08-03 23:17:47 +03:00
Peter
32c4cc1b99 no message 2018-07-20 21:17:36 +03:00
Ilya Laktyushin
d45b180681 Merge commit '39381dd1895dc77ced7b31b4bb6aa6047c0907d2' 2018-03-16 01:02:26 +04:00
Ilya Laktyushin
4006d40043 Merge commit 'f1bdc9ad8792b13fbfb45c31b210b9283b8ef4f8' into HEAD 2018-03-15 19:31:03 +04:00
Ilya Laktyushin
0864c1bc9c no message 2018-03-14 15:12:08 +04:00
Peter Iakovlev
39381dd189 no message 2018-03-02 20:44:32 +04:00
Peter
c870767bd3 no message 2018-01-09 13:17:12 +04:00
Ilya Laktyushin
53480a35a2 no message 2017-12-23 03:21:01 +04:00
Ilya Laktyushin
eeed00eb1f no message 2017-11-30 02:23:44 +04:00
Ilya Laktyushin
3643019cd7 Merge commit '67efeda4f1ff16bb2064985debd96fd79e4c5db5' 2017-09-26 18:44:03 +03:00
Peter
ddfb4abd54 no message 2017-09-11 00:05:31 +03:00
Peter
5c398bba3b Merge commit '5473b3a56b572e74abbadf11b3a1073159ea63db' 2017-09-01 14:45:41 +03:00
Peter
437c4d5882 Merge commit 'd54b5bd9f860f9ec979fd5c07b703805b2f8b466'
# Conflicts:
#	LegacyComponents/TGVideoMessageCaptureController.m
2017-09-01 14:45:32 +03:00
Peter
5473b3a56b no message 2017-09-01 14:45:21 +03:00
Peter
0b4b9e7db4 Merge commit 'fc7ca1ee2398568d3a8a2dd1b9bad4d2bc162654'
# Conflicts:
#	LegacyComponents.xcodeproj/project.pbxproj
#	LegacyComponents/LegacyComponents.h
2017-09-01 14:43:40 +03:00
Peter
d54b5bd9f8 no message 2017-09-01 14:43:20 +03:00
Peter
fc7ca1ee23 no message 2017-08-31 19:25:59 +03:00