diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2015-06-18 10:13:23 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2015-06-18 10:13:23 +0200 |
commit | a9f19366acb347b6346ef205628c179bc89034f2 (patch) | |
tree | aafbe191b3080a0de5a464d5f1c4d9a52b32b083 | |
parent | 39eb639ba1145cf61c557a7b6d3b9361261f93b7 (diff) | |
parent | 8cf5ed957d78da2e5e2620df52407f513f70d8b6 (diff) | |
download | hosts-a9f19366acb347b6346ef205628c179bc89034f2.tar.gz hosts-a9f19366acb347b6346ef205628c179bc89034f2.tar.zst hosts-a9f19366acb347b6346ef205628c179bc89034f2.zip |
Merge branch 'master' into android
-rw-r--r-- | Hiko | 1 | ||||
-rw-r--r-- | Jabbah | 1 | ||||
-rw-r--r-- | Lancel | 1 | ||||
-rw-r--r-- | Malige | 1 | ||||
-rw-r--r-- | Mercurule | 1 | ||||
-rw-r--r-- | Nasmo | 1 | ||||
-rw-r--r-- | Oldkary | 8 | ||||
-rw-r--r-- | sakamain | 1 | ||||
-rw-r--r-- | yuki | 2 |
9 files changed, 8 insertions, 9 deletions
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
3 | MIIBCgKCAQEA9AoiO1XveXC6of2ajm8HR6WQKTS6QWommRrHTzypZuWjywCTlb1y | 2 | MIIBCgKCAQEA9AoiO1XveXC6of2ajm8HR6WQKTS6QWommRrHTzypZuWjywCTlb1y |
4 | pldVxAG3BVhPBs1zbbeNNDvffSVn2WY+yZpN5vxgIS3aGALtmSF66aGnzM+yhUfa | 3 | pldVxAG3BVhPBs1zbbeNNDvffSVn2WY+yZpN5vxgIS3aGALtmSF66aGnzM+yhUfa |
@@ -6,4 +6,3 @@ MC8imUWIe2UMwihFlpARs3UrbKrOXke2ZBkXHWprQEwcUKTUPmqvH+YsCRZTHeQ3 | |||
6 | PhKI8PVam5CLB24XPMHLp/tGfT6L4smkJzo3EHB8Mr8znw7zYvJa/5djv69WNph+ | 6 | PhKI8PVam5CLB24XPMHLp/tGfT6L4smkJzo3EHB8Mr8znw7zYvJa/5djv69WNph+ |
7 | 94tPgHTFmNIz++hcQ2YDqEtCWBK2n2WBRQIDAQAB | 7 | 94tPgHTFmNIz++hcQ2YDqEtCWBK2n2WBRQIDAQAB |
8 | -----END RSA PUBLIC KEY----- | 8 | -----END RSA PUBLIC KEY----- |
9 | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
3 | MIIBCgKCAQEAwpBXRSVYkovYjT1qNKrOiz+jC255j3v/BA4VPlbLdA6edfm99bSg | 2 | MIIBCgKCAQEAwpBXRSVYkovYjT1qNKrOiz+jC255j3v/BA4VPlbLdA6edfm99bSg |
4 | G0MzPWFByArFw/kX9/wsyx7O03dD88xXS36T2b9T6RP9yutjuJ+UTMLXobydwgbo | 3 | G0MzPWFByArFw/kX9/wsyx7O03dD88xXS36T2b9T6RP9yutjuJ+UTMLXobydwgbo |
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
3 | MIIBCgKCAQEArqoqbGwHmwre/ktkVqk1xMLAgM9o5OgJKGCvhDNHssJFZ6AA2WhH | 2 | MIIBCgKCAQEArqoqbGwHmwre/ktkVqk1xMLAgM9o5OgJKGCvhDNHssJFZ6AA2WhH |
4 | fpW62IfJoXNVzrvDrVuolTLDBvjTzEgUwaW/4d4tmoaJaPwCe1n0sZ3cZe7ZCSkY | 3 | fpW62IfJoXNVzrvDrVuolTLDBvjTzEgUwaW/4d4tmoaJaPwCe1n0sZ3cZe7ZCSkY |
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
3 | MIIBCgKCAQEA1Sa3kDlpqfvbckCFbApG+w2DoKpyYfEBt8jfCa9ZhWKKKilVaz5l | 2 | MIIBCgKCAQEA1Sa3kDlpqfvbckCFbApG+w2DoKpyYfEBt8jfCa9ZhWKKKilVaz5l |
4 | srcyJUC9rk3mI7+nhNEquPGuxJRRXrfmAsqkaXkIq9vWJPwVLui2X7MCkrMGFxIf | 3 | srcyJUC9rk3mI7+nhNEquPGuxJRRXrfmAsqkaXkIq9vWJPwVLui2X7MCkrMGFxIf |
@@ -6,4 +6,3 @@ Y9EzjahpkFCtBYyXJ6mh7G3BvkYlYyhNr5j3zaXSty8NJNUsdQlDXr9dWpt5Iv0P | |||
6 | cnGc6pmk5sizU9tDQfNHuORGpVIafBxmLnv8aVT36QM8loYUXGdev+Xf4cUjgCbq | 6 | cnGc6pmk5sizU9tDQfNHuORGpVIafBxmLnv8aVT36QM8loYUXGdev+Xf4cUjgCbq |
7 | FX/4LtI+xTizIdqb82kNq5TXnx9nmX8tCwIDAQAB | 7 | FX/4LtI+xTizIdqb82kNq5TXnx9nmX8tCwIDAQAB |
8 | -----END RSA PUBLIC KEY----- | 8 | -----END RSA PUBLIC KEY----- |
9 | |||
@@ -0,0 +1,8 @@ | |||
1 | -----BEGIN RSA PUBLIC KEY----- | ||
2 | MIIBCgKCAQEAxPrfGdIs9fItc7+KWEnTHBY5uuHGg6lqO02OavSkL7Zvz4t6N6QX | ||
3 | bpQ3iUq+dOXIafFQiuOvY1zA9mcMK/ZmUBaJyaBKF40G2vQNM8rDS5ohQVMhyDrN | ||
4 | pGGWvbNZpMElqKg1GHaiw+yXcXHmB5Zh4ICYYaFzWENKY7fossulc4Y7wsWzDmH3 | ||
5 | ntgQZuD6kBvRrv00gqrjECll0IrTQ/Ix6bYkxKc5md1kC05b34JYvtthbyzUQfow | ||
6 | Fo7YmrpaS1rHyj6EQzbmYe+JNqJ1Phjm/iuE0WiMcO1IRqg+1mIuXef6IyIJ/+r4 | ||
7 | dg3UK8mDzDf4GzNKvayW67QNNarIXTWz0wIDAQAB | ||
8 | -----END RSA PUBLIC KEY----- | ||
@@ -6,4 +6,3 @@ yhYwylZtTcZJbr01SyflYsJcZovaG2PU9z+0GNvcOXOmi86XvGrOUi0NT1BqBR5C | |||
6 | W3Zcxk1TqmqwQHw4kXwHHjGBw6eLu751c/TvlyUnDssPghOPJ+B3zoTkiXpHQ55Y | 6 | W3Zcxk1TqmqwQHw4kXwHHjGBw6eLu751c/TvlyUnDssPghOPJ+B3zoTkiXpHQ55Y |
7 | TkAauvpNvreKllxTCHi5Q9ak0l76nRDROQIDAQAB | 7 | TkAauvpNvreKllxTCHi5Q9ak0l76nRDROQIDAQAB |
8 | -----END RSA PUBLIC KEY----- | 8 | -----END RSA PUBLIC KEY----- |
9 | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | -----BEGIN RSA PUBLIC KEY----- | 1 | -----BEGIN RSA PUBLIC KEY----- |
3 | MIIBCgKCAQEAx771Nb/xhWBmrhk6zCI9Jz/uY5K1uBruQpLgsWUp3hxpfQVTAKWD | 2 | MIIBCgKCAQEAx771Nb/xhWBmrhk6zCI9Jz/uY5K1uBruQpLgsWUp3hxpfQVTAKWD |
4 | 14xzH8QPCByu5jiaG74Pd27ngQdvd09sENnnZr7Ap3b8zWvwJpEdigppt9hDcY/v | 3 | 14xzH8QPCByu5jiaG74Pd27ngQdvd09sENnnZr7Ap3b8zWvwJpEdigppt9hDcY/v |
@@ -7,4 +6,3 @@ nITkz8gZbO8wWT6iWbdjHCy05vKY+iebjVDMmnRJhLBURuRIhC/X2YQi1Sgj4RI3 | |||
7 | w/IUngWveXhRVfXdFdIKVkPNtDod0FzkTblxRw5O1UDhr85RtQngoKBF0klrW8RW | 6 | w/IUngWveXhRVfXdFdIKVkPNtDod0FzkTblxRw5O1UDhr85RtQngoKBF0klrW8RW |
8 | vxTYlorSTnhwpslxZY10yMj+N4ndCFPQmQIDAQAB | 7 | vxTYlorSTnhwpslxZY10yMj+N4ndCFPQmQIDAQAB |
9 | -----END RSA PUBLIC KEY----- | 8 | -----END RSA PUBLIC KEY----- |
10 | |||