diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-02 20:42:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-02 20:42:40 +0300 |
| commit | 64095961fe490029886cae358683532ea65bf2c0 (patch) | |
| tree | 017731144aa638372b9ed356642c01920033618a /rel | |
| parent | 6f67aed3acf557bb1e37415af82acd97e46c9ac4 (diff) | |
| parent | a22a7437d84065192601f73da73d2c27111c9b15 (diff) | |
| download | pleroma-64095961fe490029886cae358683532ea65bf2c0.tar.gz | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions