Merge branch 'master' into v110

jaredhendrickson13 · web-flow · commit 341d6110e45a · 2020-11-29T09:26:57.000-07:00
diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallAliasEntryCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallAliasEntryCreate.inc
@@ -132,7 +132,7 @@ class APIFirewallAliasEntryCreate extends APIModel {
             $this->errors[] = APIResponse\get(4106);
         }
     }
-    
+
     public function validate_payload() {
         $this->__validate_name();
         $this->__validate_address();
diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallAliasEntryDelete.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallAliasEntryDelete.inc
@@ -70,7 +70,7 @@ class APIFirewallAliasEntryDelete extends APIModel {
             $this->validated_data["detail"] = implode("||", $this->validated_data["detail"]);
         }
     }
-    
+
     public function validate_payload() {
         $this->__validate_name();
         $this->__validate_address();

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class APIFirewallAliasEntryCreate extends APIModel {`
`132`	`132`	`$this->errors[] = APIResponse\get(4106);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`-`
	`135`	`+`
`136`	`136`	`public function validate_payload() {`
`137`	`137`	`$this->__validate_name();`
`138`	`138`	`$this->__validate_address();`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class APIFirewallAliasEntryDelete extends APIModel {`
`70`	`70`	`$this->validated_data["detail"] = implode("\|\|", $this->validated_data["detail"]);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`		`-`
	`73`	`+`
`74`	`74`	`public function validate_payload() {`
`75`	`75`	`$this->__validate_name();`
`76`	`76`	`$this->__validate_address();`