summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-06-14 07:42:32 -0400
committerLibravatar Tad <tad@spotco.us>2018-06-14 07:42:32 -0400
commit44cc92b05da1ce43ed3fe8e58e5a55f93442c5ee (patch)
treed585ea17e411b27612ee60277331773e69988bc6
parentMerge pull request #1997 from flacks/profiles/riot (diff)
downloadfirejail-44cc92b05da1ce43ed3fe8e58e5a55f93442c5ee.tar.gz
firejail-44cc92b05da1ce43ed3fe8e58e5a55f93442c5ee.tar.zst
firejail-44cc92b05da1ce43ed3fe8e58e5a55f93442c5ee.zip
merges
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--src/firecfg/firecfg.config1
4 files changed, 5 insertions, 2 deletions
diff --git a/README b/README
index fcebecc31..93df77151 100644
--- a/README
+++ b/README
@@ -310,6 +310,8 @@ Jean Lucas (https://github.com/flacks)
310 - add WebStorm profile 310 - add WebStorm profile
311 - add XMind profile 311 - add XMind profile
312 - add nvm to list of disabled interpreters 312 - add nvm to list of disabled interpreters
313 - fixes for tor-browser-en
314 - alias for riot-desktop
313Jericho (https://github.com/attritionorg) 315Jericho (https://github.com/attritionorg)
314 - spelling 316 - spelling
315Jesse Smith (https://github.com/slicer69) 317Jesse Smith (https://github.com/slicer69)
diff --git a/README.md b/README.md
index 1c4ffc4aa..5a3ab3a3e 100644
--- a/README.md
+++ b/README.md
@@ -101,4 +101,4 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
101# Current development version: 0.9.55 101# Current development version: 0.9.55
102 102
103## New profiles 103## New profiles
104Microsoft Office Online 104Microsoft Office Online, riot-desktop
diff --git a/RELNOTES b/RELNOTES
index f1b7a6b0a..c56fa4071 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,7 +4,7 @@ firejail (0.9.55) baseline; urgency=low
4 * support full paths in private-lib 4 * support full paths in private-lib
5 * globbing support in private-lib 5 * globbing support in private-lib
6 * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint 6 * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint
7 * new profiles: ms-skype, ms-word 7 * new profiles: ms-skype, ms-word, riot-desktop
8 -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500 8 -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500
9 9
10firejail (0.9.54) baseline; urgency=low 10firejail (0.9.54) baseline; urgency=low
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index da614ae90..d7a1f946f 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -341,6 +341,7 @@ redeclipse
341remmina 341remmina
342rhythmbox 342rhythmbox
343ricochet 343ricochet
344riot-desktop
344riot-web 345riot-web
345ristretto 346ristretto
346rocketchat 347rocketchat