summaryrefslogtreecommitdiff
path: root/httemplate/docs
diff options
context:
space:
mode:
authorIvan Kohler <ivan-debian@420.am>2012-03-15 13:56:48 -0700
committerIvan Kohler <ivan-debian@420.am>2012-03-15 13:56:48 -0700
commit7d68066ea33f9f85fe14ce663372642d7ec2ad20 (patch)
treef659173a23d541da3032f8a8156f888810d7efda /httemplate/docs
parentd622dc369cc0856fb791658b35f889470a7da605 (diff)
parenta69299c596de60f4b26db7431165f7f3ffe928e2 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/docs')
-rw-r--r--httemplate/docs/credits.html1
-rw-r--r--httemplate/docs/license.html5
2 files changed, 6 insertions, 0 deletions
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 7b3b0b93a..9bb1decea 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -61,6 +61,7 @@ Joe Camadine<BR>
Chris Cappuccio<BR>
Rebecca Cardennis<BR>
Shane Chrisp<BR>
+Kendall Conrad<BR>
Luke Crawford<BR>
Brad Dameron<BR>
Dave Denney<BR>
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index e0e40b76e..fab8cd09f 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -112,6 +112,11 @@ terms as Perl (GPL/Artistic).
Contains code derived from HTML::GoogleMapsV3 by David Peters, licensed under
the same terms as Perl (GPL/Artistic).
+<P>
+Contains the Masked Input JavaScript library by Kendall Conrad, licensed under
+a <a href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons
+Attribution-ShareAlike 3.0 United States</a> license.
+
<!-- artwork -->
<P>