merges

5 files changed, 6 insertions, 2 deletions

diff --git a/README b/README
index 33ccd9ef9..c523a9338 100644
--- a/README
+++ b/README
@@ -345,6 +345,7 @@ Rahiel Kasim (https://github.com/rahiel)
         - Mathematica profile
         - whitelisted Dropbox profile
         - whitelisted keysnail config for firefox
+        - added telegram-desktop profile
 Rahul Golam (https://github.com/technoLord)
         - strings profile
 Raphaël Droz (https://github.com/drzraf)
diff --git a/README.md b/README.md
index 765c746ed..1ed2b3489 100644
--- a/README.md
+++ b/README.md
@@ -128,5 +128,6 @@ ulimit, vhangup, vserver. This brings us to a total of 91 syscalls blacklisted b
 
 curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy,
 IntelliJ IDEA, Android Studio, electron, riot-web,
-Extreme Tux Racer, Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux
+Extreme Tux Racer, Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux,
+telegram-desktop
 
diff --git a/RELNOTES b/RELNOTES
index 9cdd71e8d..e6c2df9db 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -9,7 +9,7 @@ firejail (0.9.49) baseline; urgency=low
   * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA,
   * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer, 
   * new profiles: Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux
-  
+  * new profiles: telegram-desktop
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Mon, 12 Jun 2017 20:00:00 -0500
 
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index a60bf92c3..ac619a046 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -330,3 +330,4 @@
 /etc/firejail/pingus.profile
 /etc/firejail/simutrans.profile
 /etc/firejail/supertux2.profile
+/etc/firejail/telegram-desktop.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index eb611034f..a6472a604 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -239,6 +239,7 @@ supertux2
 synfigstudio
 telegram
 Telegram
+telegram-desktop
 thunderbird
 totem
 tracker