16 Commits

Author SHA1 Message Date
Ilya Laktyushin
43bbabfcbc no message 2018-09-07 00:35:43 +03:00
Ilya Laktyushin
1fc691a800 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-06 12:45:06 +03:00
Ilya Laktyushin
2a432ddcf4 no message 2018-09-05 19:37:37 +03:00
Peter
7a114f229c no message 2018-09-05 19:00:52 +03:00
Ilya Laktyushin
bb69ec2997 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 13:24:06 +03:00
Ilya Laktyushin
258f992051 no message 2018-09-05 13:05:17 +03:00
Ilya Laktyushin
66de87a550 Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2'
# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift
2018-09-05 01:04:07 +03:00
Ilya Laktyushin
4ec048feac no message 2018-09-02 11:55:04 +03:00
Peter
07fc80ef3a no message 2018-07-21 21:31:48 +03:00
Peter
faefdd54fe no message 2018-06-16 20:03:02 +03:00
Peter
3a998955b7 no message 2018-01-11 22:44:38 +04:00
Peter
6a47e739a3 no message 2018-01-09 13:18:08 +04:00
Peter
0f26dc36a7 no message 2017-10-03 15:57:32 +03:00
Peter
cbbcb12b3b no message 2017-08-15 14:44:14 +03:00
Peter
b6ded073ad no message 2017-07-14 15:34:30 +03:00
Peter
67af59b67c no message 2017-06-16 12:18:03 +03:00