Merge branch 'staging' of clrgitlab.intel.com:clr-documentation/project-docs into staging

Conflicts:
	source/bundles_in_clr.rst
	source/bundles_overview.rst
This commit is contained in:
Leona
2016-03-30 10:41:29 -07:00
2 changed files with 4 additions and 3 deletions
+1 -2
View File
@@ -19,7 +19,6 @@ Current list of bundles available for Clear Linux* OS for Intel® Architecture:
</style>
</head>
<table>
<tr>
<th align=left>Bundle Name</th>
@@ -826,4 +825,4 @@ Current list of bundles available for Clear Linux* OS for Intel® Architecture:
<p>Include the modules and binaries meant to be used as a VirtualBox instance</p>
</td>
</tr>
</table>
</table>
+3 -1
View File
@@ -861,4 +861,6 @@ Current list of available bundles:
<p>Include the modules and binaries meant to be used as a VirtualBox instance</p>
</td>
</tr>
</table>
</table>