This is an automated email from the ASF dual-hosted git repository. andrijapanic pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
commit d4114c761e8a248de0207560e2ad9e9bc7903e70 Merge: 8cc8c00c 2ad566e Author: andrijapanicsb <[email protected]> AuthorDate: Fri May 1 22:55:14 2020 +0100 fix merge conflict on index.html and download.html content/archives.html | 5 +++++ content/downloads.html | 18 +++++++++--------- content/index.html | 4 ++-- content/users.html | 2 +- data/acs-events.csv | 7 ++++--- data/cloudstack.yml | 10 +++++----- source/downloads.html.markdown.erb | 2 +- source/users.html.markdown | 2 +- 8 files changed, 28 insertions(+), 22 deletions(-) diff --cc content/archives.html index a8863e1,e4c1cd0..6db2b3e --- a/content/archives.html +++ b/content/archives.html @@@ -123,9 -123,9 +123,14 @@@ <h2 id="indicators">Archived Releases</h2> <ul> + <li>4.13 + <ul> + <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2";>apache-cloudstack-4.13.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.asc";>PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.md5";>MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-clo [...] ++ </ul> ++ </li> + <li>4.12 + <ul> + <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2";>apache-cloudstack-4.13.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.asc";>PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-cloudstack-4.13.0.0-src.tar.bz2.md5";>MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.13.0.0/apache-clo [...] </ul> </li> <li>4.12
