From 039254970201ec347f14dcbbfd63acdce3028654 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 22 Feb 2016 03:50:32 +0100
Subject: [PATCH] Add footer on conversations page

closes #6710
---
 Changelog.md                                | 1 +
 app/controllers/conversations_controller.rb | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 84e64e77c..336d7c293 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 * Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
 
 ## Features
+* Added the footer to conversation pages
 
 # 0.5.7.0
 
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index b4fb495d4..f1266f3ad 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,7 +1,5 @@
 class ConversationsController < ApplicationController
   before_action :authenticate_user!
-
-  layout ->(c) { request.format == :mobile ? "application" : "with_header" }
   respond_to :html, :mobile, :json, :js
 
   def index