137 Commits

Author SHA1 Message Date
Ilya Laktyushin
448cc9562b no message 2017-12-24 01:12:23 +04:00
Ilya Laktyushin
2f3400d1e0 no message 2017-12-23 11:32:58 +04:00
Ilya Laktyushin
53480a35a2 no message 2017-12-23 03:21:01 +04:00
Ilya Laktyushin
50c8bb3afb no message 2017-12-11 20:18:49 +04:00
Ilya Laktyushin
f8959d68e0 no message 2017-12-07 18:22:34 +04:00
Ilya Laktyushin
eeed00eb1f no message 2017-11-30 02:23:44 +04:00
Ilya Laktyushin
0af24b5954 no message 2017-11-24 15:32:12 +04:00
Ilya Laktyushin
aa4d497047 no message 2017-11-17 22:33:50 +04:00
Ilya Laktyushin
0db95cbfcd no message 2017-11-13 20:19:16 +04:00
Ilya Laktyushin
db08f798c4 no message 2017-11-11 17:27:22 +04:00
Ilya Laktyushin
94496b6a39 no message 2017-11-11 11:06:55 +04:00
Ilya Laktyushin
9079a2539c no message 2017-11-10 13:10:51 +04:00
Peter
62a8f702ce Merge commit 'b22579ab5708d34df6c19cb8db16e60e74848ee1' 2017-11-09 15:54:40 +03:00
Peter
2381550398 no message 2017-11-09 15:54:36 +03:00
Ilya Laktyushin
b22579ab57 no message 2017-11-08 16:23:50 +04:00
Ilya Laktyushin
96574b29dd no message 2017-10-13 18:45:15 +03:00
Ilya Laktyushin
d81371fbc9 no message 2017-10-06 13:34:13 +03:00
Ilya Laktyushin
6d712e3b37 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2017-10-05 23:50:44 +03:00
Ilya Laktyushin
b28e18e44f no message 2017-10-05 23:50:33 +03:00
Peter
5c281627c4 no message 2017-10-05 23:28:43 +03:00
Ilya Laktyushin
ff88cb94b7 no message 2017-10-04 19:03:37 +03:00
Peter
88b5d34187 Merge commit '893457ba75dbb847e5318bde333c9b0ffc300420' 2017-10-04 18:12:14 +03:00
Peter
a536f339f4 Merge commit 'a7b34e3817200622ddb76eea1e2da7467b783490' 2017-10-04 18:11:53 +03:00
Peter
92ee4585fb no message 2017-10-04 18:11:48 +03:00
Ilya Laktyushin
893457ba75 no message 2017-10-04 18:11:28 +03:00
Ilya Laktyushin
a7b34e3817 no message 2017-10-04 15:25:28 +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