diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-12 01:12:02 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-12 01:12:02 +0100 |
| commit | e97c5917f6bd6690282f1df59916ab038e0ad9fd (patch) | |
| tree | 0a0b60aa8087f3e175c95c1c89ee4713a8de82c2 | |
| parent | 85d373bbd6c39290ace50e91dab648a8f968b95f (diff) | |
| parent | e9be45fa1cc955ff8a0e497f8fd3ed7521d0b5a1 (diff) | |
| download | hosts-e97c5917f6bd6690282f1df59916ab038e0ad9fd.tar.gz hosts-e97c5917f6bd6690282f1df59916ab038e0ad9fd.tar.zst hosts-e97c5917f6bd6690282f1df59916ab038e0ad9fd.zip | |
Merge branch 'master' into android
| -rw-r--r-- | ImmaeEu | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | Address = immae.eu | 1 | Address = vpn.immae.eu |
| 2 | Address = immae.eu 1194 | 2 | Address = vpn.immae.eu 1194 |
| 3 | -----BEGIN RSA PUBLIC KEY----- | 3 | -----BEGIN RSA PUBLIC KEY----- |
| 4 | MIIBCgKCAQEA6sJagBYTGUNjtiaPm3Se3BAa1nWbnHS7feTQ1C+L9WifgGkQICkr | 4 | MIIBCgKCAQEA6sJagBYTGUNjtiaPm3Se3BAa1nWbnHS7feTQ1C+L9WifgGkQICkr |
| 5 | TXkQpGKIN+1mVD3Tl/Mx3BWtGGUMNgJhZ3p7rJgEXNuiWptEpG7BmujW61gVxQ2v | 5 | TXkQpGKIN+1mVD3Tl/Mx3BWtGGUMNgJhZ3p7rJgEXNuiWptEpG7BmujW61gVxQ2v |