Revert the merge revert

This reverts commit 3c2414028b.
2024-01-06 18:21:41 +01:00
parent 3c2414028b
commit 16b6d43786
127 changed files with 769 additions and 1746 deletions
--- a/src/Model/ChatItem.cpp
+++ b/src/Model/ChatItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #include "ChatItem.h"
--- a/src/Model/ChatItem.h
+++ b/src/Model/ChatItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3

 #ifndef CHATITEM_H
--- a/src/Model/ContactItem.cpp
+++ b/src/Model/ContactItem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3
 #include "ContactItem.h"
 #include "chatmodel.h"
--- a/src/Model/ContactItem.h
+++ b/src/Model/ContactItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTITEM_H
 #define CONTACTITEM_H
--- a/src/Model/ContactRequest.cpp
+++ b/src/Model/ContactRequest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // GPLv3

 #include "ContactRequest.h"
--- a/src/Model/ContactRequest.h
+++ b/src/Model/ContactRequest.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifndef CONTACTREQUEST_H
 #define CONTACTREQUEST_H
--- a/src/Model/ContactRequestChatItem.cpp
+++ b/src/Model/ContactRequestChatItem.cpp
@@ -1,3 +1,3 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #include "ContactRequestChatItem.h"
--- a/src/Model/ContactRequestChatItem.h
+++ b/src/Model/ContactRequestChatItem.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Hush developers
+// Copyright 2019-2024 The Hush developers
 // Released under the GPLv3
 #ifdef CONTACTREQUESTCHATITEM_H
 #define CONTACTREQUESTCHATITEM_H