Merge branch 'asf-site' of
https://git-wip-us.apache.org/repos/asf/incubator-juneau-website.git
into asf-site
Conflicts:
content/downloads.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/3a17d6d3
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/3a17d6d3
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/3a17d6d3
Branch: refs/heads/asf-site
Commit: 3a17d6d377137a78a3ac1b637935acce62557054
Parents: 5351b45 9f9cefc
Author: jamesbognar <[email protected]>
Authored: Tue Aug 9 17:00:33 2016 -0400
Committer: jamesbognar <[email protected]>
Committed: Tue Aug 9 17:00:33 2016 -0400
----------------------------------------------------------------------
content/downloads.html | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3a17d6d3/content/downloads.html
----------------------------------------------------------------------
diff --cc content/downloads.html
index 7fb93d6,16b7843..8d0d803
--- a/content/downloads.html
+++ b/content/downloads.html
@@@ -13,7 -13,10 +13,8 @@@
</p>
<h5 class='toc'>Builds</h5>
<ul class='spaced-list'>
- <li><a
href='https://builds.apache.org/job/Juneau-Java-1.7'>Jenkins</a>
+ <li><a
href='https://builds.apache.org/job/Juneau-Java-1.7'>Jenkins</a> - <a
href='https://builds.apache.org/job/Juneau-Java-1.7/'><img
src='https://builds.apache.org/job/Juneau-Java-1.7/badge/icon'></a>
</ul>
- <p>
- Current build status: <a
href='https://builds.apache.org/job/Juneau-Java-1.7/'><img
src='https://builds.apache.org/job/Juneau-Java-1.7/badge/icon'></a>
- </p>
++
</body>
</html>
