aboutsummaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-07-29 09:11:22 -0500
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-07-29 09:11:22 -0500
commit059ea07a98f508bb99f15e3e434c7c3169a013dd (patch)
treee7635bf98f5c925e9e68a00c611ac82b5a77dacf /platform
parentmerges (diff)
downloadfirejail-059ea07a98f508bb99f15e3e434c7c3169a013dd.tar.gz
firejail-059ea07a98f508bb99f15e3e434c7c3169a013dd.tar.zst
firejail-059ea07a98f508bb99f15e3e434c7c3169a013dd.zip
merges
Diffstat (limited to 'platform')
-rw-r--r--platform/debian/conffiles3
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index a2e02dd6a..a60bf92c3 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -66,6 +66,7 @@
66/etc/firejail/dragon.profile 66/etc/firejail/dragon.profile
67/etc/firejail/dropbox.profile 67/etc/firejail/dropbox.profile
68/etc/firejail/elinks.profile 68/etc/firejail/elinks.profile
69/etc/firejail/electron.profile
69/etc/firejail/emacs.profile 70/etc/firejail/emacs.profile
70/etc/firejail/empathy.profile 71/etc/firejail/empathy.profile
71/etc/firejail/enchant.profile 72/etc/firejail/enchant.profile
@@ -230,6 +231,7 @@
230/etc/firejail/qutebrowser.profile 231/etc/firejail/qutebrowser.profile
231/etc/firejail/ranger.profile 232/etc/firejail/ranger.profile
232/etc/firejail/rhythmbox.profile 233/etc/firejail/rhythmbox.profile
234/etc/firejail/riot-web.profile
233/etc/firejail/ristretto.profile 235/etc/firejail/ristretto.profile
234/etc/firejail/rtorrent.profile 236/etc/firejail/rtorrent.profile
235/etc/firejail/scribus.profile 237/etc/firejail/scribus.profile
@@ -264,6 +266,7 @@
264/etc/firejail/transmission-show.profile 266/etc/firejail/transmission-show.profile
265/etc/firejail/uget-gtk.profile 267/etc/firejail/uget-gtk.profile
266/etc/firejail/unbound.profile 268/etc/firejail/unbound.profile
269/etc/firejail/unknown-horizons.profile
267/etc/firejail/unrar.profile 270/etc/firejail/unrar.profile
268/etc/firejail/unzip.profile 271/etc/firejail/unzip.profile
269/etc/firejail/uudeview.profile 272/etc/firejail/uudeview.profile