Merged master into dashboards2

This commit is contained in:
Dante Loayza
2015-06-12 10:25:51 -04:00

View File

@@ -151,12 +151,16 @@
<a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a> <a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
</li> </li>
<li> <li>
<a href="#" class="mafe-menu-permissions"></a> <a href="#" class="mafe-menu-templates"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a> <a href="#" class="btn_create mafe-menu-templates-create"><span></span></a>
</li> </li>
<li> <li>
<a href="#" class="mafe-menu-filemanager"></a> <a href="#" class="mafe-menu-public"></a>
<a href="#" class="btn_create mafe-menu-filemanager-create"><span></span></a> <a href="#" class="btn_create mafe-menu-public-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-permissions"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
</li> </li>
</ul> </ul>
</div> </div>