From 745ae109656afd0819a81bdd9a455d5b790f6624 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 5 Jun 2007 10:09:24 +0000
Subject: [PATCH] Added some more internal IPs - Legacy-Id: 229
---
ietf/settings.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ietf/settings.py b/ietf/settings.py
index 1e97c20d8..e1014c1c7 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -123,6 +123,12 @@ INTERNAL_IPS = (
# shiraz and marsanne
'81.232.110.214',
'2001:16d8:ff54::1',
+# merlot
+ '194.146.105.14',
+ '2001:698:9:31:214:22ff:fe21:bb',
+# local
+ '127.0.0.1',
+ '::1',
)
# Valid values: