pidgin/pidgin

pidgin/pidgin/pidgin/resources/Conversations/
Merge upstream, resolve conflicts

2019-11-04, qarkai
00a9ef389aab