You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/08/30 15:33:39 UTC

[commons-lang] 01/01: Merge branch 'release' and resolve conficts.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git

commit 21fe158cb2037b7f1e23c529c06bcca949ae1d1e
Merge: 31dc5c7 2f19010
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 30 11:33:31 2020 -0400

    Merge branch 'release' and resolve conficts.

 src/site/site.xml       | 3 ++-
 src/site/xdoc/index.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc src/site/site.xml
index b51b788,4ac8d77..b1f79b9
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@@ -27,7 -27,8 +27,8 @@@
              <item name="Overview"        href="/index.html"/>
              <item name="Download"        href="/download_lang.cgi"/>
              <item name="Users guide"     href="/userguide.html"/>
-             <item name="Javadoc (Latest release)" href="javadocs/api-release/index.html"/>
+             <item name="Release History" href="/changes-report.html"/>
 -            <item name="Javadoc (Latest release)" href="javadocs/api-release/index.html"/>
++            <item name="Javadoc"         href="javadocs/api-release/index.html"/>
          </menu>
  
          <menu name="Development">