Merge pull request #2803 from Stultus2/master

Fixing 2 bugs

app/views/conversations/_show.haml

@@ -28,5 +28,5 @@
       .content
         = form_for [conversation, Message.new] do |message|
           = message.text_area :text, :rows => 5, :tabindex => 1
-          .right
+          .left
             = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2

config/application.yml.example

@@ -214,6 +214,7 @@ defaults: &defaults
 development:
   <<: *defaults
   serve_static_assets: true
+  no_follow_diasporahq: true
 
 production:
   <<: *defaults