diff options
author | 2016-11-03 15:06:57 +0100 | |
---|---|---|
committer | 2016-11-03 15:06:57 +0100 | |
commit | 2aafd9bd3a96b578bf423eb8faba0efe965c52d5 (patch) | |
tree | 6ab4d26a6daad1e3972a86dbdcbe67030d710883 /platform/debian/conffiles | |
parent | Improvements for Zathura profile (diff) | |
parent | removed warning if --quiet is enabled (diff) | |
download | firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.gz firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.zst firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/debian/conffiles')
-rw-r--r-- | platform/debian/conffiles | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 03fb2fe75..df660ab4f 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -155,3 +155,19 @@ | |||
155 | /etc/firejail/7z.profile | 155 | /etc/firejail/7z.profile |
156 | /etc/firejail/keepass.profile | 156 | /etc/firejail/keepass.profile |
157 | /etc/firejail/keepassx.profile | 157 | /etc/firejail/keepassx.profile |
158 | /etc/firejail/claws-mail.profile | ||
159 | /etc/firejail/mutt.profile | ||
160 | /etc/firejail/git.profile | ||
161 | /etc/firejail/emacs.profile | ||
162 | /etc/firejail/vim.profile | ||
163 | /etc/firejail/xpdf.profile | ||
164 | /etc/firejail/virtualbox.profile | ||
165 | /etc/firejail/openshot.profile | ||
166 | /etc/firejail/flowblade.profile | ||
167 | /etc/firejail/eog.profile | ||
168 | /etc/firejail/evolution.profile | ||
169 | /etc/firejail/start-tor-browser.profile | ||
170 | /etc/firejail/xiphos.profile | ||
171 | /etc/firejail/display.profile | ||
172 | /etc/firejail/Wire.profile | ||
173 | /etc/firejail/mumble.profile | ||