aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2017-10-08 10:11:32 -0400
committerLibravatar Tad <tad@spotco.us>2017-10-08 10:11:32 -0400
commit7304aa3da97e6805bbe1c1d6af1b95fe01153e3c (patch)
treed9e0ecdce5b5d1e87082a0cb258688698d89e9ef
parentMerge pull request #1593 from onny/patch-1 (diff)
downloadfirejail-7304aa3da97e6805bbe1c1d6af1b95fe01153e3c.tar.gz
firejail-7304aa3da97e6805bbe1c1d6af1b95fe01153e3c.tar.zst
firejail-7304aa3da97e6805bbe1c1d6af1b95fe01153e3c.zip
Merges
-rw-r--r--README4
-rw-r--r--README.md2
2 files changed, 5 insertions, 1 deletions
diff --git a/README b/README
index ccc3e2588..15c7ae69e 100644
--- a/README
+++ b/README
@@ -270,6 +270,8 @@ Joan Figueras (https://github.com/figue)
270 - added cyberfox profile 270 - added cyberfox profile
271John Mullee (https://github.com/jmullee) 271John Mullee (https://github.com/jmullee)
272 - fix empty-string assignment in whitelisting code 272 - fix empty-string assignment in whitelisting code
273Jonas Heinrich (https://github.com/onny)
274 - added signal-dekstop profile
273jrabe (https://github.com/jrabe) 275jrabe (https://github.com/jrabe)
274 - disallow access to kdbx files 276 - disallow access to kdbx files
275 - Epiphany profile 277 - Epiphany profile
@@ -292,6 +294,8 @@ KellerFuchs (https://github.com/KellerFuchs)
292 - make ~/.local read-only 294 - make ~/.local read-only
293KOLANICH (https://github.com/KOLANICH) 295KOLANICH (https://github.com/KOLANICH)
294 - added symlink fixer fix_private-bin.py in contrib section 296 - added symlink fixer fix_private-bin.py in contrib section
297Kunal Mehta (https://github.com/legoktm)
298 - converted all links to https in manpages
295laniakea64 (https://github.com/laniakea64) 299laniakea64 (https://github.com/laniakea64)
296 - added fj-mkdeb.py script to build deb packages 300 - added fj-mkdeb.py script to build deb packages
297Lari Rauno (https://github.com/tuutti) 301Lari Rauno (https://github.com/tuutti)
diff --git a/README.md b/README.md
index 57f9a3e25..ef65f51b3 100644
--- a/README.md
+++ b/README.md
@@ -181,4 +181,4 @@ calligrawords, cin, dooble, dooble-qt4, fetchmail, freecad, freecadcmd, google-e
181imagej, karbon, kdenlive, krita, linphone, lmms, macrofusion, mpd, natron, Natron, 181imagej, karbon, kdenlive, krita, linphone, lmms, macrofusion, mpd, natron, Natron,
182ricochet, shotcut, teamspeak3, tor, tor-browser-en, Viber, x-terminal-emulator, zart, 182ricochet, shotcut, teamspeak3, tor, tor-browser-en, Viber, x-terminal-emulator, zart,
183conky, arch-audit, ffmpeg, bluefish, cliqz, cinelerra, openshot-qt, pinta, uefitool, 183conky, arch-audit, ffmpeg, bluefish, cliqz, cinelerra, openshot-qt, pinta, uefitool,
184aosp, pdfmod, gnome-ring 184aosp, pdfmod, gnome-ring, signal-dekstop