Merge branch 'rel/v1.4.15' into 'master'v1.4.15

Remmina v1.4.15

See merge request Remmina/Remmina!2256

6 files changed, 10 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b8aaebbe..070a2ac2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.4.15
+[full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.14...v1.4.15)
+
+* Fixing SSH plugin color palette initialization. [!2255](https://gitlab.com/Remmina/Remmina/merge_requests/2255) *@antenore*
+
 ## v1.4.14
 [full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.13...v1.4.14)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d468d08ab..439475ec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,7 +276,7 @@ endif()
 set(WITH_LIBRARY_VERSIONING "ON")
 set(REMMINA_VERSION_MAJOR "1")
 set(REMMINA_VERSION_MINOR "4")
-set(REMMINA_VERSION_REVISION "14")
+set(REMMINA_VERSION_REVISION "15")
 # set(REMMINA_VERSION_SUFFIX "1") set(REMMINA_VERSION
 # "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}")
 set(REMMINA_VERSION
diff --git a/Doxyfile b/Doxyfile
index a599077ba..f6cc26fa7 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Remmina - The GTK+ Remote Desktop Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.4.14
+PROJECT_NUMBER         = v1.4.15
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/data/desktop/org.remmina.Remmina.appdata.xml b/data/desktop/org.remmina.Remmina.appdata.xml
index e165cd7cd..6245e28ad 100644
--- a/data/desktop/org.remmina.Remmina.appdata.xml
+++ b/data/desktop/org.remmina.Remmina.appdata.xml
@@ -16,7 +16,7 @@
   <summary xml:lang="fr">Client de contrôle de bureau à distance</summary>
   <content_rating type="oars-1.1" />
   <releases>
-      <release version="1.4.14" date="2021-05-10"/>
+      <release version="1.4.15" date="2021-05-11"/>
   </releases>
   <description>
     <p>
diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json
index 6627066f2..66ff97fab 100644
--- a/flatpak/org.remmina.Remmina.json
+++ b/flatpak/org.remmina.Remmina.json
@@ -223,7 +223,7 @@
                     "type": "git",
                     "url": "https://github.com/FreeRDP/FreeRDP.git",
                     "tag": "2.3.1",
-                    "commit": "c3df0be63953ed98525d9b736ba878ad733de059",
+                    "commit": "136a58fbd0c3c2421a4e02d6422119406f1c32c2",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
diff --git a/po/remmina.pot b/po/remmina.pot
index 938b89023..9b7fd5b38 100644
--- a/po/remmina.pot
+++ b/po/remmina.pot
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Remmina v1.4.14\n"
+"Project-Id-Version: Remmina v1.4.15\n"
 "Report-Msgid-Bugs-To: l10n@lists.remmina.org\n"
 "POT-Creation-Date: 2021-05-11 06:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"