• Lukas Fülling's avatar
    Merge branch 'master' of github.com:tootsuite/mastodon · b5ec3d6c
    Lukas Fülling authored
     Conflicts:
    	CHANGELOG.md
    	app/controllers/admin/pending_accounts_controller.rb
    	app/controllers/settings/preferences_controller.rb
    	app/javascript/mastodon/locales/sk.json
    	app/views/admin/pending_accounts/_account.html.haml
    	config/locales/cs.yml
    	config/locales/eo.yml
    	config/locales/fr.yml
    	config/locales/hu.yml
    	config/locales/nl.yml
    	config/locales/no.yml
    	config/locales/pl.yml
    	config/locales/pt-BR.yml
    	config/locales/sr-Latn.yml
    	config/navigation.rb
    	lib/mastodon/version.rb
    b5ec3d6c