From 6c8a8cedc4dbfc9a9d6976718e369ed36a152670 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Fri, 3 Mar 2017 13:19:24 -0500
Subject: RT# 21110, Updated files to use jquery-validate jquery plugin. This
 allows for field validation instead of just form validation. Also updated
 footer so it does not use experimental keys on scalar. Dereferenced hash ref
 prior to using keys.

---
 httemplate/docs/credits.html |  2 +-
 httemplate/docs/license.html | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'httemplate/docs')

diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 555bab402..fee15af0a 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -107,7 +107,7 @@ Johan Vromans<BR>
 Peter Wemm<BR>
 Mark Williamson<BR>
 Tim Yardley<BR>
-
+Jörn Zaefferer<BR>
 </CENTER>
 
 <BR>
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 5a824fd03..8b44630c4 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -133,6 +133,22 @@ under the terms of the MIT license.
 Contains the XRegExp library by Steven Levithan, licensed under the terms
 of the MIT license.
 
+<<<<<<< HEAD
+=======
+<P>
+Contains the Google Maps Longitude and Latitude Picker, by Richard Dancsi,
+licensed under the terms of the MIT license.
+
+<P>
+Contains js-cookie by Klaus Hartl, Fagner Brack and contributors, licensed
+under the terms of the MIT license.
+
+<P>
+Contains the form validation Jquery plugin jquery-validation 
+<a href="https://github.com/jquery-validation/jquery-validation/blob/master/LICENSE.md"> by Jörn Zaefferer, 
+licensed under the terms of MIT License.
+
+>>>>>>> f650b4e... RT# 21110, Updated files to use jquery-validate jquery plugin.  This allows for field validation instead of just form validation.  Also updated footer so it does not use experimental keys on scalar.  Dereferenced hash ref prior to using keys.
 <!-- artwork -->
 
 <P>
-- 
cgit v1.2.1