diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-19 10:59:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-19 10:59:09 +0300 |
| commit | 6f67aed3acf557bb1e37415af82acd97e46c9ac4 (patch) | |
| tree | 9155b5d55ad25d6e82ea1d365dd973addc30d1da /rel | |
| parent | e4f3d7f69d5d3db787f8b4906cacc673e2f970f1 (diff) | |
| parent | f95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff) | |
| download | pleroma-6f67aed3acf557bb1e37415af82acd97e46c9ac4.tar.gz | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions