Merge upstream changes

4 files changed, 7 insertions, 1 deletions

diff --git a/README b/README
index 0b720d24a..9414d21d9 100644
--- a/README
+++ b/README
@@ -445,6 +445,9 @@ nyancat18 (https://github.com/nyancat18)
         - added ardour4, dooble, karbon, krita profiles
 Ondra Nekola (https://github.com/satai)
         - allow firefox theming with non-global themes
+Lorenzo "Palinuro" Faletra (https://github.com/PalinuroSec)
+        - prevent thunderbird conflicts when firefox is running
+        - add join-or-start to pluma to open multiple files in tabs
 Panzerfather (https://github.com/Panzerfather)
         - allow eog to access user's trash
 Patrick Toomey (https://sourceforge.net/u/ptoomey/profile/)
diff --git a/etc/keepassxc.profile b/etc/keepassxc.profile
index d565373f4..fba709a78 100644
--- a/etc/keepassxc.profile
+++ b/etc/keepassxc.profile
@@ -42,6 +42,7 @@ shell none
 
 private-bin keepassxc
 private-dev
+
 private-etc alternatives,fonts,ld.so.cache,machine-id
 private-tmp
 
diff --git a/etc/pluma.profile b/etc/pluma.profile
index 79e4b89b3..a8b1e4cc6 100644
--- a/etc/pluma.profile
+++ b/etc/pluma.profile
@@ -44,3 +44,5 @@ private-tmp
 memory-deny-write-execute
 noexec ${HOME}
 noexec /tmp
+
+join-or-start pluma
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index db563b25c..c3358a9e8 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -44,4 +44,4 @@ writable-run-user
 # Redirect
 # Uncomment if you use enigmail
 # ignore nodbus
-include firefox.profile
+include firefox-common.profile