Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Release02x01'
  • Loading branch information
gac410 committed Jan 25, 2017
2 parents 913e454 + ad08e87 commit d97fe65
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions core/COPYRIGHT
@@ -1,9 +1,9 @@
Foswiki is Copyright (C) 2008-2014 Foswiki Contributors. ALL RIGHTS RESERVED.
Foswiki is Copyright (C) 2008-2017 Foswiki Contributors. ALL RIGHTS RESERVED.
Foswiki Contributors are listed in the AUTHORS file in the root of this
distribution.

The following copyrights also apply to the Foswiki concept and some of
the code.
* TWiki (R) is Copyright (C) 1999-2014 Peter Thoeny, peter@thoeny.org
* TWiki (R) is Copyright (C) 1999-2016 Peter Thoeny, peter09[at]thoeny.org
and TWiki Contributors. ALL RIGHTS RESERVED.
* JosWiki is Copyright © 1998 Markus Peter - SPiN GmbH warpi@spin.de
1 change: 1 addition & 0 deletions core/index.html
Expand Up @@ -60,6 +60,7 @@ <h2>Static documentation</h2>
<ul>
<li><a href="readme.txt">README</a></li>
<li><a href="LICENSE">LICENSE</a></li>
<li><a href="COPYRIGHT">COPYRIGHT</a></li>
<li><a href="INSTALL.html">Installation Guide</a></li>
<li><a href="UpgradeGuide.html">Upgrade Guide</a></li>
<li><a href="ReleaseNotes02x01.html">Foswiki-2.1 Release Notes</a></li>
Expand Down
6 changes: 3 additions & 3 deletions core/lib/Foswiki.pm
Expand Up @@ -211,8 +211,8 @@ BEGIN {

# DO NOT CHANGE THE FORMAT OF $VERSION.
# Use $RELEASE for a descriptive version.
use version 0.77; $VERSION = version->declare('v2.1.2_001');
$RELEASE = 'Foswiki-2.1.3-Beta1';
use version 0.77; $VERSION = version->declare('v2.1.2_002');
$RELEASE = 'Foswiki-2.1.3-Beta2';

# Default handlers for different %TAGS%
# Where an entry is set as 'undef', the tag will be demand-loaded
Expand Down Expand Up @@ -3704,7 +3704,7 @@ sub getApproxRevTime {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down

0 comments on commit d97fe65

Please sign in to comment.