merge in 1.1.2 bug release changes and fix conflicts

This commit is contained in:
Keith Woodlock
2013-05-19 12:32:28 +01:00
5 changed files with 34 additions and 17 deletions
+1 -1
View File
@@ -90,7 +90,7 @@
<body>
<div id="page-wrapper">
<div id="flybar">
<div id="nav-logo">1.1.0.RELEASE API</div>
<div id="nav-logo">1.1.2.RELEASE API</div>
<div class="flybar-nav">
<h2 class="flybar-button">Overview</h2>
<div class="flybar-menu-overview">