Merge branch 'back' of github.com:Rulingcom/orbit into back
Conflicts: app/assets/javascripts/mobile/orbit.mobile.js.erb app/assets/stylesheets/mobile.css app/assets/stylesheets/mobile/orbit-mobile.css.erb app/controllers/application_controller.rb app/controllers/mobile_controller.rb app/views/layouts/mobile.mobile.erb app/views/mobile/_footer.mobile.erb app/views/mobile/_header.mobile.erb app/views/mobile/_menu.mobile.erb app/views/mobile/index.mobile.erb config/routes.rb
This commit is contained in:
commit
282604d1fa
4 files changed
+2
-10
No files matched your search
@@ -14,6 +14,7 @@
|
||||
<li>
|
||||
<%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
|
||||
<i class="icons-phone"></i>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user