Merge remote-tracking branch 'stevee/zoneedit.com'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:28:30 +0000 (10:28 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jun 2014 10:28:30 +0000 (10:28 +0000)
1  2 
ddns.conf.sample
src/ddns/__init__.py
src/ddns/providers.py

Simple merge
@@@ -106,10 -106,8 +106,11 @@@ class DDNSCore(object)
                        DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
 +                      DDNSProviderStrato,
 +                      DDNSProviderTwoDNS,
 +                      DDNSProviderUdmedia,
                        DDNSProviderVariomedia,
+                       DDNSProviderZoneedit,
                ):
                        self.register_provider(provider)
  
Simple merge