Merge branch 'master' of gitlab.com:delkappa/delkappa

This commit is contained in:
Manos Katsomallos 2017-10-30 16:23:53 +01:00
commit 6e82b1a1e0

View File

@ -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="contactEmail" name="contactEmail" placeholder="Email (required)">
<input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject"> <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> <textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea>
<button <button
<<<<<<< HEAD class="g-recaptcha submit"
<<<<<<< HEAD data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
class="g-recaptcha submit" Submit
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
Submit
</button> </button>
=======
class="g-recaptcha"
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
Submit
</button>
<button class="submit">Submit</button>
>>>>>>> 4e103ad9c58ff7d1bfd9fc105e027b54373dd96b
<span id="image-loader"> <span id="image-loader">
=======
class="g-recaptcha submit"
data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt"
>
Submit
</button>
<span id="image-loader">
>>>>>>> 3f150e0b32b08b003b615ffecbc75c143c6c63f7
<img alt="" src="images/loader.gif"> <img alt="" src="images/loader.gif">
</span> </span>
</fieldset> </fieldset>