diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2015-07-30 13:22:58 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2015-07-30 13:22:58 +0200 |
| commit | 70d8add6a845fcd603c78db0097d7b3269379485 (patch) | |
| tree | 3652cc4bf44e1a90bba04112fbcfbb3b8c80e531 | |
| parent | fdc0fb6bc6f5ec496f0c04dca4f1439bd407aa29 (diff) | |
| parent | f8e3d106979fc6eac4f2011de713eddf89d417fb (diff) | |
| download | hosts-70d8add6a845fcd603c78db0097d7b3269379485.tar.gz hosts-70d8add6a845fcd603c78db0097d7b3269379485.tar.zst hosts-70d8add6a845fcd603c78db0097d7b3269379485.zip | |
Merge branch 'master' into android
| -rw-r--r-- | ImmaeEu | 1 | ||||
| -rw-r--r-- | homura | 1 |
2 files changed, 1 insertions, 1 deletions
| @@ -1,4 +1,5 @@ | |||
| 1 | Address = immae.eu | 1 | Address = immae.eu |
| 2 | Address = immae.eu 1194 | ||
| 2 | -----BEGIN RSA PUBLIC KEY----- | 3 | -----BEGIN RSA PUBLIC KEY----- |
| 3 | MIIBCgKCAQEA6sJagBYTGUNjtiaPm3Se3BAa1nWbnHS7feTQ1C+L9WifgGkQICkr | 4 | MIIBCgKCAQEA6sJagBYTGUNjtiaPm3Se3BAa1nWbnHS7feTQ1C+L9WifgGkQICkr |
| 4 | TXkQpGKIN+1mVD3Tl/Mx3BWtGGUMNgJhZ3p7rJgEXNuiWptEpG7BmujW61gVxQ2v | 5 | TXkQpGKIN+1mVD3Tl/Mx3BWtGGUMNgJhZ3p7rJgEXNuiWptEpG7BmujW61gVxQ2v |
| @@ -1,4 +1,3 @@ | |||
| 1 | |||
| 2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
| 3 | MIIBCgKCAQEAuWPpZSRLNvjT+u5j50jpjkJRaHQEu+YjqVuPiYxSNHTEMIu4O4MD | 2 | MIIBCgKCAQEAuWPpZSRLNvjT+u5j50jpjkJRaHQEu+YjqVuPiYxSNHTEMIu4O4MD |
| 4 | ZKiuxjsETXQIXJZ1gWHgG8YyHjBGuiJHt97UDoR5s81vk7jdp9h850w8aKzDBFnb | 3 | ZKiuxjsETXQIXJZ1gWHgG8YyHjBGuiJHt97UDoR5s81vk7jdp9h850w8aKzDBFnb |