diff options
| author | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
|---|---|---|
| committer | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
| commit | dfd4c81e8f460ed917a0fcfc8b0008a069a54f3e (patch) | |
| tree | 30fbb56a3c4890772780a571b9e8e6f3c0b0d563 /Lassulus | |
| parent | 73bb9a720134ddc53446aa83b778b588466de31d (diff) | |
| parent | 97a9aa1a5840957e655037d9bc68421727dfab21 (diff) | |
Merge branch 'master' of github.com:miefda/retiolum
Conflicts:
Lassulus
Diffstat (limited to 'Lassulus')
| -rw-r--r-- | Lassulus | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,5 +1,4 @@ Address = 10.42.3.253 -Address = 10.9.9.71 Subnet = 10.7.7.11 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE |