Merge branch 'master' into 0.33.4

GetPublii · Mar 12, 2019 · ce67d83 · ce67d83
2 parents a72b045 + 4093ced
commit ce67d83
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
@@ -1 +1 @@
-{"version":"0.33.4","build":11590,"status":"Beta"}
+{"version":"0.33.4","build":11590,"status":"Beta"}
diff --git a/app/src/components/ServerSettings.vue b/app/src/components/ServerSettings.vue
@@ -85,7 +85,6 @@
                       customHeight="50"                   
                       name="zip" />
                 </div>
-
             </div>
 
             <fields-group
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"0.33.4","build":11590,"status":"Beta"}
		{"version":"0.33.4","build":11590,"status":"Beta"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,6 @@ @@
                           customHeight="50"
                           name="zip" />
                     </div>
                 </div>
                 <fields-group
@@ Expand Down @@