summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-05-29 23:35:39 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-05-29 23:35:39 +0200
commit338a604b137012c6455679a7b46adc46c793341d (patch)
tree54bc353ca4cc6168dccaf291433839c2df097972
parent79f6022bf202371af204470605cfda10ba60d039 (diff)
parent0cd140f46c68098a5d66332d3fb9d461e1bc7827 (diff)
downloadhosts-338a604b137012c6455679a7b46adc46c793341d.tar.gz
hosts-338a604b137012c6455679a7b46adc46c793341d.tar.zst
hosts-338a604b137012c6455679a7b46adc46c793341d.zip
Merge branch 'master' into android
-rw-r--r--HomeGlido12
1 files changed, 6 insertions, 6 deletions
diff --git a/HomeGlido b/HomeGlido
index 917f3d2..95561de 100644
--- a/HomeGlido
+++ b/HomeGlido
@@ -1,9 +1,9 @@
1 1
2-----BEGIN RSA PUBLIC KEY----- 2-----BEGIN RSA PUBLIC KEY-----
3MIIBCgKCAQEAv7UyHqhjSnLsEqyy4zxn353D3i0KMbMYDKr24fVyc6xofiGvUctm 3MIIBCgKCAQEAx9cKeJ3rp6XTb2qVXfnzrJXmH3bsbkkYD1HkuTfzELMassXh8Sbm
4RaNxugw2HyOxwzNxjP5zchufaTAu5krdwSmcnx8SNEhAbXU6mMvEeRqagv9i+hVq 4YC9pfW4i2NQf93USxsb9QshBIsNZ22UvAtqxRT++T2MDHIm87xlEDp0qk48pnw+r
5ZHuA+vRzupfgax6YX5lSFolajA3LkZm8FlodIYsbJzAgYjdqP+WSZIHI5LhpuIZL 5F7UcMPr8O2joflLF1Wohu2MnbBWcOLhJAUAGu3e0IebzRtudVPDvbfLSbs2Qd179
6WCgqvMs/yg4qKyVkkEQxb7EFLUqavXpM4lQlvH+uauCLjsFv+lOHa6J5XUgh/QIE 6a7CA7y70C9XKz2wLBV83xcihmiZmofq12/r8e92G/w+FeqQAargRQihka3LyKfT/
7ywwxLkFFeZdfD0UiUUjGnQY6m47UZH88jHXyymCU72Rgv2A3mLmfvQ/oW8XsP4wF 7tWeKv+aG2pf7qEeWKKwi40q0tqY98kp8s5Vw1sOGWomkQsbg7qZXGvruRkaqjLw5
89nHys0xzg6X5LmP9R3sGLClFbDeWWXARqQIDAQAB 88FcQ/dIW1hoCiGufE1WJmBJEjNioMJ3JswIDAQAB
9-----END RSA PUBLIC KEY----- 9-----END RSA PUBLIC KEY-----