Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/c12dcc1e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/c12dcc1e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/c12dcc1e Branch: refs/heads/asf-site Commit: c12dcc1e2599e35c5f24eab67de733449a615d2d Parents: 79d7c49 7fb8314 Author: Pierre-Luc Dion <[email protected]> Authored: Tue Apr 19 10:37:49 2016 -0400 Committer: Pierre-Luc Dion <[email protected]> Committed: Tue Apr 19 10:37:49 2016 -0400 ---------------------------------------------------------------------- content/index.html | 15 ++++++++------- source/index.html.erb | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
