X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fdocs%2Flicense.html;h=8b44630c47c21d9484b9e18c51c12d482529d8fd;hb=6c8a8cedc4dbfc9a9d6976718e369ed36a152670;hp=a1bc006700ee99f934a61fa00395e1c8bcde91f5;hpb=e1c940c29461bddbf4e889d44a02bdeb4b7ca388;p=freeside.git

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index a1bc00670..8b44630c4 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -6,7 +6,7 @@
 
 <P>
 
-Copyright &copy; 2005-2015 Freeside Internet Services, Inc.<BR>
+Copyright &copy; 2005-2017 Freeside Internet Services, Inc.<BR>
 Copyright &copy; 2000-2005 Ivan Kohler<BR>
 Copyright &copy; 1999 Silicon Interactive Software Design<BR>
 All rights reserved<BR>
@@ -129,7 +129,26 @@ other contributors, licensed under the terms of the MIT license.
 Contains the Spectrum No Hassle jQuery Colorpicker by Brian Grinstead, licensed
 under the terms of the MIT license.
 
+<P>
+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>