Merge branch 'master' of gitlab.com:delkappa/delkappa
This commit is contained in:
		@ -392,10 +392,18 @@
 | 
				
			|||||||
            <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"
 | 
					                class="g-recaptcha submit"
 | 
				
			||||||
                data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
 | 
					                data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
 | 
				
			||||||
              Submit
 | 
					              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">
 | 
				
			||||||
              <img alt="" src="images/loader.gif">
 | 
					              <img alt="" src="images/loader.gif">
 | 
				
			||||||
            </span>
 | 
					            </span>
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user