Merge branch 'master' of gitlab.com:delkappa/delkappa
This commit is contained in:
commit
6e82b1a1e0
25
index.html
25
index.html
@ -391,29 +391,12 @@
|
||||
<input type="text" value="" size="35" maxlength="100" id="contactEmail" name="contactEmail" placeholder="Email (required)">
|
||||
<input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject">
|
||||
<textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea>
|
||||
<button
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
class="g-recaptcha submit"
|
||||
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
|
||||
Submit
|
||||
<button
|
||||
class="g-recaptcha submit"
|
||||
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
|
||||
Submit
|
||||
</button>
|
||||
=======
|
||||
class="g-recaptcha"
|
||||
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
|
||||
Submit
|
||||
</button>
|
||||
<button class="submit">Submit</button>
|
||||
>>>>>>> 4e103ad9c58ff7d1bfd9fc105e027b54373dd96b
|
||||
<span id="image-loader">
|
||||
=======
|
||||
class="g-recaptcha submit"
|
||||
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt"
|
||||
>
|
||||
Submit
|
||||
</button>
|
||||
<span id="image-loader">
|
||||
>>>>>>> 3f150e0b32b08b003b615ffecbc75c143c6c63f7
|
||||
<img alt="" src="images/loader.gif">
|
||||
</span>
|
||||
</fieldset>
|
||||
|
Loading…
Reference in New Issue
Block a user