Commit Graph

59 Commits

Author SHA1 Message Date
Peter
92ee4585fb no message 2017-10-04 18:11:48 +03:00
Ilya Laktyushin
8556302220 Merge commit 'a0e3a9beeb46bdb0c7d11afa3514d4b38934e46d' 2017-10-03 12:28:03 +03:00
Ilya Laktyushin
45d6233011 no message 2017-10-02 22:35:53 +03:00
Peter
a0e3a9beeb Merge commit '177950035498d3f1127a1f8e055d257d6834e452' 2017-10-02 21:29:12 +03:00
Ilya Laktyushin
1779500354 no message 2017-10-02 20:01:11 +03:00
Peter
ace268f09a Merge commit 'd7593512d5fd0d7b8c78d1d3e8715a59c0f3bd2a' 2017-10-01 00:04:11 +03:00
Ilya Laktyushin
d7593512d5 no message 2017-10-01 00:02:37 +03:00
Peter
3f37661770 no message 2017-09-30 23:41:54 +03:00
Peter
e33b6e83e0 Merge commit '3643019cd7684346a7826a62b4689db040a2148c' 2017-09-26 21:06:40 +03:00
Peter
8421b6d41c no message 2017-09-26 21:06:24 +03:00
Ilya Laktyushin
3643019cd7 Merge commit '67efeda4f1ff16bb2064985debd96fd79e4c5db5' 2017-09-26 18:44:03 +03:00
Ilya Laktyushin
86a91011e8 no message 2017-09-13 20:52:56 +03:00
Peter
67efeda4f1 Merge commit '3facbe4ddc9bf0e3183789fbb201866168acbde5' 2017-09-13 20:51:47 +03:00
Peter
8837f04843 no message 2017-09-13 20:51:42 +03:00
Ilya Laktyushin
8016099032 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents
# Conflicts:
#	LegacyComponents/TGMediaPickerGalleryVideoScrubber.m
2017-09-12 10:45:32 +03:00
Ilya Laktyushin
ff0d334f19 no message 2017-09-12 10:41:47 +03:00
Peter
3facbe4ddc Merge commit '7903caf3c0eb8317def6f8d460d3160cbc5fcf9b' 2017-09-11 00:05:38 +03:00
Peter
ddfb4abd54 no message 2017-09-11 00:05:31 +03:00
Peter
7903caf3c0 no message 2017-09-08 20:19:20 +03:00
Peter
28bad79ead Merge commit '4e1152655de8f5c502c37462f5a87216eee7f8a0' 2017-09-01 15:40:57 +03:00
Peter
4e1152655d no message 2017-09-01 15:40:14 +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
5b4fafb3d0 no message 2017-08-31 19:45:56 +03:00
Peter
fc7ca1ee23 no message 2017-08-31 19:25:59 +03:00
Ilya Laktyushin
a505338491 no message 2017-08-24 08:08:47 +03:00
Ilya Laktyushin
e3364a6e33 no message 2017-08-22 23:32:28 +03:00
Ilya Laktyushin
37be648e6c Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2017-08-22 02:01:09 +03:00
Ilya Laktyushin
39d403790b no message 2017-08-22 02:00:31 +03:00
Peter
83b9d54bb0 no message 2017-08-22 01:14:50 +03:00
Ilya Laktyushin
c8214d24a9 no message 2017-08-21 15:56:37 +03:00
Ilya Laktyushin
ae22b45db3 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2017-08-20 15:27:11 +03:00
Ilya Laktyushin
c0a1a7f406 no message 2017-08-20 15:26:25 +03:00
Peter
c670712a9f no message 2017-08-19 10:58:25 +03:00
Ilya Laktyushin
c578600bc1 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2017-08-17 00:10:14 +03:00
Ilya Laktyushin
20911e9173 no message 2017-08-17 00:09:54 +03:00
Peter
bdd76ec5a2 no message 2017-08-15 22:25:51 +03:00
Ilya Laktyushin
78c9ff409c Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2017-08-15 11:21:23 +03:00
Ilya Laktyushin
ba45f84217 no message 2017-08-15 11:21:05 +03:00
Peter
689d57c98e no message 2017-08-15 00:20:27 +03:00
Ilya Laktyushin
0dc27a249d Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents
# Conflicts:
#	LegacyComponents.xcodeproj/project.pbxproj
#	LegacyComponents/LegacyComponents.h
2017-08-07 21:18:52 +03:00
Ilya Laktyushin
15e267149a no message 2017-08-07 21:13:18 +03:00
Peter
cc97d228a7 no message 2017-08-05 19:19:57 +03:00
Peter
5f92ce2d04 no message 2017-08-04 18:11:13 +03:00
Peter
9cce4bda59 Merge commit '21a0e3b9850cb7f664700bc67005407d261bfc59' 2017-08-04 14:20:32 +03:00
Peter
b6cafcc834 no message 2017-08-04 14:20:00 +03:00
Peter
21a0e3b985 no message 2017-07-31 19:29:43 +03:00