Roman Kapustin 376e76e00d Resolve merge conflicts

2018-11-18 16:10:36 +03:00

..

Selection

Merge remote-tracking branch 'upstream/master' into Private_Messages

2018-11-12 20:41:10 +09:00

Tabs

Add back support for new API and private messages

2018-11-13 15:20:59 +09:00

ChatLine.cs

rename user to private

2018-07-24 05:14:47 +02:00

ChatTabControl.cs

Change signature to new event handler

2018-10-02 12:02:47 +09:00

DrawableChannel.cs

Merge branch 'master' into Private_Messages

2018-08-04 00:33:46 +02:00

ExternalLinkDialog.cs

External link warning code cleanup

2018-11-01 23:52:07 +03:00