RT# 21110, Updated files to use jquery-validate jquery plugin. This allows for field...

[freeside.git] / httemplate / docs / license.html

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 5a824fd..8b44630 100644 (file)
--- 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>