8 Commits

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