Attempted manual merge to avoid conflicts
This commit is contained in:
parent
96272ffd44
commit
cd524350d8
7 changed files with 328 additions and 121 deletions
|
|
@ -18,7 +18,7 @@
|
|||
<span style="color: white">{{ form.email.errors|striptags}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-default btn-transparent btn-lg">{% trans "Request Newsletter" %}</button>
|
||||
<button type="submit" class="btn btn-default btn-transparent btn-lg">{% trans "Request Beta Access" %}</button>
|
||||
</form>
|
||||
<script>
|
||||
$('#beta_access').ajaxForm({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue