diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
| commit | 908cf22a6cb07044eb0fb44c9673c8adcf22c0db (patch) | |
| tree | b522172092989cb1d1312f846974ff55493fbee9 /rel | |
| parent | b4139cc5472079a34f0256ac9991a0222844d44c (diff) | |
| parent | 699fc9569fa06278baaec6804348375cb9891185 (diff) | |
| download | pleroma-908cf22a6cb07044eb0fb44c9673c8adcf22c0db.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions