16f41643ed
Conflicts: .gitignore td/generate/scheme/td_api.tlo td/telegram/ContactsManager.h
Conflicts: .gitignore td/generate/scheme/td_api.tlo td/telegram/ContactsManager.h