aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-04-01 06:19:52 -0400
committerLibravatar Tad <tad@spotco.us>2018-04-01 06:19:52 -0400
commit9215d8326cb544e2e7f5f4f2b265b2a5be75856f (patch)
tree937c2bd80227185882fa1c1a1cdad30aa4e860d7
parentMerge pull request #1849 from jelford/gcloud-profile (diff)
downloadfirejail-9215d8326cb544e2e7f5f4f2b265b2a5be75856f.tar.gz
firejail-9215d8326cb544e2e7f5f4f2b265b2a5be75856f.tar.zst
firejail-9215d8326cb544e2e7f5f4f2b265b2a5be75856f.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 124f40219..80a133148 100644
--- a/README
+++ b/README
@@ -287,6 +287,8 @@ Jaykishan Mutkawoa (https://github.com/jmutkawoa)
287James Elford (https://github.com/jelford) 287James Elford (https://github.com/jelford)
288 - pass password manager support 288 - pass password manager support
289 - removed shell none from ssh-agent configuration, fixing the infinit loop 289 - removed shell none from ssh-agent configuration, fixing the infinit loop
290 - added gcloud profile
291 - blacklist sensitive cloud provider files in disable-common
290Jericho (https://github.com/attritionorg) 292Jericho (https://github.com/attritionorg)
291 - spelling 293 - spelling
292Jesse Smith (https://github.com/slicer69) 294Jesse Smith (https://github.com/slicer69)
diff --git a/README.md b/README.md
index 27f4c2fc4..4d9727797 100644
--- a/README.md
+++ b/README.md
@@ -308,4 +308,4 @@ Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-can
308pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain, 308pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain,
309tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder, 309tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder,
310gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.8, 310gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.8,
311thunderbird-beta, ncdu, gnome-logs 311thunderbird-beta, ncdu, gnome-logs, gcloud
diff --git a/RELNOTES b/RELNOTES
index f62f6d674..e76800f2c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -30,7 +30,7 @@ firejail (0.9.53) baseline; urgency=low
30 * new profiles: pdfchain, tilp, vivaldi-snapshot, bitcoin-qt, kaffeine, 30 * new profiles: pdfchain, tilp, vivaldi-snapshot, bitcoin-qt, kaffeine,
31 * new profiles: falkon, gnome-builder, asunder, VS Code, gnome-recipes 31 * new profiles: falkon, gnome-builder, asunder, VS Code, gnome-recipes
32 * new profiles: akonadi_controle, evince-previewer, evince-thumbnailer, 32 * new profiles: akonadi_controle, evince-previewer, evince-thumbnailer,
33 * new profiles: blender-2.8, thunderbird-beta, ncdu, gnome-logs 33 * new profiles: blender-2.8, thunderbird-beta, ncdu, gnome-logs, gcloud
34 -- netblue30 <netblue30@yahoo.com> Thu, 1 Mar 2018 08:00:00 -0500 34 -- netblue30 <netblue30@yahoo.com> Thu, 1 Mar 2018 08:00:00 -0500
35 35
36firejail (0.9.52) baseline; urgency=low 36firejail (0.9.52) baseline; urgency=low
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index a5eca096b..1f56e2532 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -134,6 +134,7 @@ freshclam
134frozen-bubble 134frozen-bubble
135gajim 135gajim
136galculator 136galculator
137gcloud
137geany 138geany
138geary 139geary
139gedit 140gedit