Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2014-12-08 18:31:27 +08:00
commit bec81bb837
1 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<% if !@plugin_shows.blank? %>
<div id="member-module"> <div id="member-module">
<div id="module-navbar"> <div id="module-navbar">
<div class="navbar"> <div class="navbar">
@ -65,7 +65,7 @@
</div> </div>
</div> </div>
</div> </div>
<% end %>
</div> </div>