Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-01-03 04:22:22 +01:00
commit efee32a024

View file

@ -24,6 +24,7 @@
= nav_entry "Inbox", "/inbox", badge: inbox_count = nav_entry "Inbox", "/inbox", badge: inbox_count
= render "layouts/notifications" = render "layouts/notifications"
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right
%li
.btn.btn-primary.navbar-btn.btn-sm.hidden-xs{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
%i.fa.fa-pencil-square-o %i.fa.fa-pencil-square-o
%li.dropdown %li.dropdown