Skip to content

Commit

Permalink
Merge pull request #152 from CON-In-A-Box/ARIC_Copyright
Browse files Browse the repository at this point in the history
Update Copyright
  • Loading branch information
tskeeley authored May 9, 2018
2 parents 5f48851 + 56980e3 commit f98dced
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
7 changes: 7 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
***CON-In-A-Box is possible because of the work of:***

* Aric Stewart
* DeNae Leverentz
* Michael Schappe
* Sean Berry
* Thomas Keeley
15 changes: 15 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
CON-In-A-Box

Copyright 2007-2018 Convergence Events, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion pages/base/disclaimer.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ echo "</div>\n";
<div class="w3-panel w3-leftbar w3-small w3-lime">
All parts of Con-In-A-Box&trade;, including but not limited to the Dual-X icon, CON-In-A-Box&trade; logo, name CON-In-A-Box&trade;, scripts, programs, coding, styles, data models, CGI, HTML, custom PHP, structure, feeds, or methods, except where otherwise protected (exceptions include but not limited to the Neon-php library maintained by z2systems, the Speller Pages Project from Sourceforge.net protected under the GNU Public License, or the PHP-Fortune script from Henrik Aasted Sorensen) are:
<div class="w3-container w3-center w3-large">
&copy; Copyright 2005-<?php echo $year; ?> - Thomas S. Keeley
&copy; Copyright 2005-<?php echo $year; ?> - Convergence Events, Inc.
</div>
</div>

Expand Down

0 comments on commit f98dced

Please sign in to comment.