merge conflicts, text copying from context menu in message line

shared/global.cpp

@@ -19,6 +19,7 @@
 #include "global.h"
 
 #include "enums.h"
+#include "ui/models/roster.h"
 
 Shared::Global* Shared::Global::instance = 0;
 const std::set<QString> Shared::Global::supportedImagesExts = {"png", "jpg", "webp", "jpeg", "gif", "svg"};

shared/global.h

@@ -47,7 +47,6 @@ namespace Shared {
     
     class Global {
         Q_DECLARE_TR_FUNCTIONS(Global)
-        
     public:
         struct FileInfo {
             enum class Preview {
@@ -64,7 +63,7 @@ namespace Shared {
         };
         
         Global();
-        
+
         static Global* getInstance();
         static QString getName(Availability av);
         static QString getName(ConnectionState cs);