diff options
| author | lain <lain@soykaf.club> | 2020-11-03 13:11:36 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-03 13:11:36 +0000 |
| commit | f7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7 (patch) | |
| tree | 5e2e3767cce93218ae162bd564673d830f2d3e1b /lib/pleroma/web/admin_api/controllers | |
| parent | 0d8cc0905aeebb965df0cf755a171d21b01ed978 (diff) | |
| parent | c37118e6f26f0305d540047e4ccb8d594d2c0e6b (diff) | |
| download | pleroma-f7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7.tar.gz | |
Merge branch 'patch-4' into 'develop'
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled
Closes #2217
See merge request pleroma/pleroma!3089
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers')
0 files changed, 0 insertions, 0 deletions