Manual merge
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Fri, 25 Apr 2014 12:45:19 +0200
changeset 137bc6545eceeb1
parent 136 175cbb03dc5f
parent 135 48b6ae811266
child 138 f4d6b81c2f07
child 144 f784d803f065
Manual merge
     1.1 --- a/minesweeper/src/main/webapp/pages/index.html	Fri Apr 25 12:44:49 2014 +0200
     1.2 +++ b/minesweeper/src/main/webapp/pages/index.html	Fri Apr 25 12:45:19 2014 +0200
     1.3 @@ -126,7 +126,7 @@
     1.4                our documentation.
     1.5            </p>
     1.6            <p><a class="btn btn-default"
     1.7 -                target="_blank" href="http://bits.netbeans.org/html+java/0.7.6/"
     1.8 +                target="_blank" href="http://bits.netbeans.org/html+java/"
     1.9                  role="button">Read more &raquo;</a></p>
    1.10         </div>
    1.11          <div class="col-md-4">