Merge exp [stable~75]

2015-05-24 22:22:30 +02:00 · 2015-05-24 22:22:30 +02:00 · 6da404261e
parent 0bbab3c168
commit 6da404261e
3 changed files with 2 additions and 23 deletions
--- a/enigmail/.config
+++ b/enigmail/.config
@ -4,8 +4,8 @@ smtp_port    = 587
 imap_server  = imap.gmail.com
 imap_port    = 993

-mail_address = doowap31@gmail.com
+mail_address = test@mail.com

-login        = doowap31@gmail.com
+login        = equal_mailadress_or_different_login

 text_editor  = nano
--- a/enigmail/.config~
+++ b/enigmail/.config~
@ -1,11 +0,0 @@
-smtp_server  = smtp.gmail.com
-smtp_port    = 587
-
-imap_server  = imap.gmail.com
-imap_port    = 993
-
-mail_address = doowap31@gmail.com
-
-login        = doowap31@gmail.com
-
-text_editor  = gedit
--- a/enigmail/bucket-file~
+++ b/enigmail/bucket-file~
@ -1,10 +0,0 @@
-Chère Thalees,
-
-   J'ai toujours eu cette envie soudaine et secrète de vous communiquer
-   mes amitiées et mes plus sincères salutations.
-
-   Miaow !
-
-                                                   Votre admirateur secret.
-
-7