Merge branch 'develop' into feature/dla/emojibase_integration

1 year ago · 546ab95356
2 changed files with 2 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -81,7 +81,7 @@ If after your research you still have a question, ask at [#element-x-android:mat
				@@ -81,7 +81,7 @@ If after your research you still have a question, ask at [#element-x-android:mat

 ## Copyright & License

-Copyright (c) 2022 New Vector Ltd
+Copyright © New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the [LICENSE](LICENSE) file, or at:

--- a/changelog.d/1187.misc
+++ b/changelog.d/1187.misc
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+Remove unnecessary year in copyright mention.
				`@ -0,0 +1 @@` @@ -0,0 +1 @@
				`Remove unnecessary year in copyright mention.`