aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2018-01-16 18:07:03 -0600
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2018-01-16 18:07:03 -0600
commit62077c459f3a3e61b80338304a5a37e6c8538d64 (patch)
treedf1770fde5954daa406a5f847edf7aa137c63daf
parentMerge pull request #1715 from viq/patch-1 (diff)
downloadfirejail-62077c459f3a3e61b80338304a5a37e6c8538d64.tar.gz
firejail-62077c459f3a3e61b80338304a5a37e6c8538d64.tar.zst
firejail-62077c459f3a3e61b80338304a5a37e6c8538d64.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 b0f5d2dfb..e8dad6244 100644
--- a/README
+++ b/README
@@ -601,6 +601,8 @@ vismir2 (https://github.com/vismir2)
601 - claws-mail, mutt, git, emacs, vim profiles 601 - claws-mail, mutt, git, emacs, vim profiles
602 - lots of profile fixes 602 - lots of profile fixes
603 - support for truecrypt and zuluCrypt 603 - support for truecrypt and zuluCrypt
604viq (https://github.com/viq)
605 - discord-canary profile
604Vladimir Gorelov (https://github.com/larkvirtual) 606Vladimir Gorelov (https://github.com/larkvirtual)
605 - added Yandex browser profile 607 - added Yandex browser profile
606Vladimir Schowalter (https://github.com/VladimirSchowalter20) 608Vladimir Schowalter (https://github.com/VladimirSchowalter20)
diff --git a/README.md b/README.md
index a4cff8934..f2cde391b 100644
--- a/README.md
+++ b/README.md
@@ -100,4 +100,4 @@ Use this issue to request new profiles: [#1139](https://github.com/netblue30/fir
100 100
101## New profiles 101## New profiles
102 102
103Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed 103Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-canary
diff --git a/RELNOTES b/RELNOTES
index a4cf17f70..2c6e535ef 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
1firejail (0.9.53) baseline; urgency=low 1firejail (0.9.53) baseline; urgency=low
2 * work in progress 2 * work in progress
3 * new profiles: basilisk, Tor Browser language packs, PlayOnLinux, sylpheed 3 * new profiles: basilisk, Tor Browser language packs, PlayOnLinux, sylpheed, discord-canary
4 -- netblue30 <netblue30@yahoo.com> Tue, 12 Dec 2017 08:00:00 -0500 4 -- netblue30 <netblue30@yahoo.com> Tue, 12 Dec 2017 08:00:00 -0500
5 5
6firejail (0.9.52) baseline; urgency=low 6firejail (0.9.52) baseline; urgency=low
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 3dbd8df1a..852351d51 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -84,6 +84,7 @@ dia
84digikam 84digikam
85dillo 85dillo
86dino 86dino
87discord-canary
87display 88display
88dnscrypt-proxy 89dnscrypt-proxy
89dnsmasq 90dnsmasq