From: Eugen <eugen@zeonfederated.com>
Date: Thu, 1 Dec 2016 00:12:38 +0000 (+0100)
Subject: Merge pull request #322 from unsmell/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=96a2a6523bb668658b5278221152f415e34ed3fa;p=mastodon.git

Merge pull request #322 from unsmell/master

Devise, Doorkeeper, settings & general PT translation
---

96a2a6523bb668658b5278221152f415e34ed3fa