about summary refs log tree commit diff
path: root/app/views/layouts/application.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-02-11 15:43:09 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-02-11 15:43:09 +0100
commite6408b2e7ade3dac8dcf14bcda5b5c6a159fa74c (patch)
tree7ba827f801bea1556231d275a6a8a35471f8a954 /app/views/layouts/application.html.haml
parent0afed995ce60dec11bc7718f83ca5afde86f6228 (diff)
parent446aad4ce2cb7afd0ba8e4b508e4dcba57eac790 (diff)
Merge branch 'feature-privacy-federation' into development
Diffstat (limited to 'app/views/layouts/application.html.haml')
-rw-r--r--app/views/layouts/application.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e122e1c55..7eae6982b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -13,7 +13,7 @@
 
     %title
       = "#{yield(:page_title)} - " if content_for?(:page_title)
-      Mastodon
+      = Setting.site_title
 
     = stylesheet_link_tag 'application', media: 'all'
     = csrf_meta_tags