• Lukas Fülling's avatar
    Merge branch 'master' of github.com:tootsuite/mastodon · be45e9c2
    Lukas Fülling authored
     Conflicts:
    	app/controllers/admin/settings_controller.rb
    	app/javascript/mastodon/locales/co.json
    	app/javascript/mastodon/locales/de.json
    	app/javascript/mastodon/locales/fi.json
    	app/javascript/mastodon/locales/he.json
    	app/javascript/mastodon/locales/hr.json
    	app/javascript/mastodon/locales/hy.json
    	app/javascript/mastodon/locales/id.json
    	app/javascript/mastodon/locales/io.json
    	app/javascript/mastodon/locales/ja.json
    	app/javascript/mastodon/locales/pt.json
    	app/javascript/mastodon/locales/sk.json
    	app/javascript/mastodon/locales/sl.json
    	app/javascript/mastodon/locales/sv.json
    	app/javascript/mastodon/locales/th.json
    	app/javascript/mastodon/locales/zh-CN.json
    	app/javascript/mastodon/locales/zh-HK.json
    	app/models/form/admin_settings.rb
    	app/serializers/rss/account_serializer.rb
    	app/serializers/rss/tag_serializer.rb
    	app/views/about/_links.html.haml
    	app/views/about/more.html.haml
    	app/views/about/show.html.haml
    	app/views/home/index.html.haml
    	app/views/layouts/admin.html.haml
    	app/views/layouts/auth.html.haml
    	app/views/layouts/mailer.html.haml
    	app/views/layouts/public.html.haml
    	config/locales/ar.yml
    	config/locales/ast.yml
    	config/locales/bg.yml
    	config/locales/ca.yml
    	config/locales/co.yml
    	config/locales/cs.yml
    	config/locales/de.yml
    	config/locales/devise.pl.yml
    	config/locales/el.yml
    	config/locales/en.yml
    	config/locales/eo.yml
    	config/locales/fi.yml
    	config/locales/gl.yml
    	config/locales/he.yml
    	config/locales/hr.yml
    	config/locales/hu.yml
    	config/locales/io.yml
    	config/locales/nl.yml
    	config/locales/no.yml
    	config/locales/oc.yml
    	config/locales/pl.yml
    	config/locales/pt-BR.yml
    	config/locales/pt.yml
    	config/locales/sr-Latn.yml
    	config/locales/sv.yml
    	config/locales/th.yml
    	config/locales/tr.yml
    	config/locales/uk.yml
    	config/locales/zh-CN.yml
    	config/locales/zh-HK.yml
    	spec/views/about/show.html.haml_spec.rb
    	yarn.lock
    be45e9c2