Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

[akkoma] / lib / pleroma / web / templates / layout / app.html.eex
diff --git a/lib/pleroma/web/templates/layout/app.html.eex b/lib/pleroma/web/templates/layout/app.html.eex

index 5836ec1e0b705bf6f5bc02cfadb5c6c9ee3f1352..3f28f1920a1816d760ec65e9173f559f084392e1 100644 (file)
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -37,7 +37,7 @@
        }
  
        a {
-        color: color: #d8a070;
+        color: #d8a070;
          text-decoration: none;
        }
  
@@ -228,7 +228,7 @@
    <body>
      <div class="container">
        <h1><%= Pleroma.Config.get([:instance, :name]) %></h1>
-      <%= render @view_module, @view_template, assigns %>
+      <%= @inner_content %>
      </div>
    </body>
  </html>