Merge branch 'master' into newsletter

This commit is contained in:
Bastian Greshake
2017-06-16 10:02:54 +02:00
committed by GitHub

View File

@@ -13,7 +13,7 @@
<% if @user.description != nil %>
<p><%= @user.description %> </p>
<% end %>
<%= link_to("Send "+ @first_name + " a message", {:controller => "messages", :action => "new"}, :user_to_send => @user.id, class: "btn btn-primary userpage__new-messages") %>
<%= link_to("Send "+ @first_name + " a message", {:controller => "messages", :action => "new", :user_to_send => @user.id}, class: "btn btn-primary userpage__new-messages") %>
</div>
<%if current_user%>