From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 14 Feb 2019 18:01:49 +0000 (-0500)
Subject: Merge branch 'develop' into feature/adminRevamp
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=29336ee8af1d761363c46d0e20bd9a40df77239e;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/adminRevamp
---

29336ee8af1d761363c46d0e20bd9a40df77239e
diff --cc views/admin/member/memberInfo/editProfileAddress.html
index 1505014e,ba03e245..f958d0d3
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@@ -52,8 -52,8 +52,8 @@@
                          <div class="glm-row">
                              <h4 {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</h4>
                              <div {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
 -                                <select name="county">
 -                                        <option value="0"></option>
 +                                <select name="county" class="browser-default">
-                                         <option value="0"{if $v.default} selected="selected"{/if}></option>
++                                        <option value="0"{if $v.default} selected="selected"{/if}></option> develop
                                      {foreach from=$memberInfo.fieldData.county.list item=v}
                                          <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                                      {/foreach}