diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-10 16:18:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-10 16:18:32 +0300 |
| commit | 39ce894a07cc546092e9c3fcdedabd2b750524c0 (patch) | |
| tree | cf36180e1effe3c90a40174e9510ab5cbffdba3f /priv | |
| parent | 6c94b7498b889ffe13691123c94bbe5440786852 (diff) | |
| parent | 05ca420c0994b079116b40ea5a84214b50d56d0e (diff) | |
| download | pleroma-39ce894a07cc546092e9c3fcdedabd2b750524c0.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions