summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-08-15 15:52:18 +0000
committerintrigeri <intrigeri@boum.org>2018-08-15 15:52:18 +0000
commit4d3f6ca3dd0f028e39c13f3ec78ca77caca58b57 (patch)
tree03e1bb157bcd9b1bad76ae324fe6d4ae8d04bfcb /.gitignore
parentde365b1b02add116eb0b48512bb4519fe0a6f8de (diff)
parent57a4453c64dbb78447409ff27c8bbebf7864fa34 (diff)
Merge branch 'feature/14594-asp-gui' into devel
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e76bd28..6bbccc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@
/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop
/config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop
/config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml
+/config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop
/config/chroot_local-includes/usr/share/applications/tails-documentation.desktop
/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop
/config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop