From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 30 Jul 2015 11:22:58 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=70d8add6a845fcd603c78db0097d7b3269379485;hp=fdc0fb6bc6f5ec496f0c04dca4f1439bd407aa29;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git

Merge branch 'master' into android
---

diff --git a/ImmaeEu b/ImmaeEu
index 9ed5ad3..612005b 100644
--- a/ImmaeEu
+++ b/ImmaeEu
@@ -1,4 +1,5 @@
 Address = immae.eu
+Address = immae.eu 1194
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEA6sJagBYTGUNjtiaPm3Se3BAa1nWbnHS7feTQ1C+L9WifgGkQICkr
 TXkQpGKIN+1mVD3Tl/Mx3BWtGGUMNgJhZ3p7rJgEXNuiWptEpG7BmujW61gVxQ2v
diff --git a/homura b/homura
index 88aeb6d..7fbf76a 100644
--- a/homura
+++ b/homura
@@ -1,4 +1,3 @@
-
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAuWPpZSRLNvjT+u5j50jpjkJRaHQEu+YjqVuPiYxSNHTEMIu4O4MD
 ZKiuxjsETXQIXJZ1gWHgG8YyHjBGuiJHt97UDoR5s81vk7jdp9h850w8aKzDBFnb