Merge branch 'reseller_template_limits' into 'master'

Marius Cramer

2014-07-08 5d1c691970d8e30d4ab6e3ba9efcec98f858b1fc

 interface/web/tools/interface_settings.php

@@ -126,7 +126,7 @@
         print '<script type="text/javascript">document.location.reload();</script>';
         exit;
      }
      else parent::onShow();
      //else parent::onShow();
   }