Merge remote-tracking branch...
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex
No related tags found
Showing
- lib/pleroma/web/mastodon_api/views/account_view.ex 5 additions, 3 deletionslib/pleroma/web/mastodon_api/views/account_view.ex
- lib/pleroma/web/mastodon_api/views/notification_view.ex 1 addition, 1 deletionlib/pleroma/web/mastodon_api/views/notification_view.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 6 additions, 4 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- priv/static/adminfe/app.85534e14.css 0 additions, 0 deletionspriv/static/adminfe/app.85534e14.css
- priv/static/adminfe/chunk-0d8f.d85f5a29.css 1 addition, 1 deletionpriv/static/adminfe/chunk-0d8f.d85f5a29.css
- priv/static/adminfe/chunk-136a.f1130f8e.css 1 addition, 1 deletionpriv/static/adminfe/chunk-136a.f1130f8e.css
- priv/static/adminfe/chunk-13e9.98eaadba.css 1 addition, 0 deletionspriv/static/adminfe/chunk-13e9.98eaadba.css
- priv/static/adminfe/chunk-2b9c.feb61a2b.css 1 addition, 0 deletionspriv/static/adminfe/chunk-2b9c.feb61a2b.css
- priv/static/adminfe/chunk-46cf.a43e9415.css 0 additions, 1 deletionpriv/static/adminfe/chunk-46cf.a43e9415.css
- priv/static/adminfe/chunk-46ef.145de4f9.css 1 addition, 1 deletionpriv/static/adminfe/chunk-46ef.145de4f9.css
- priv/static/adminfe/chunk-87b3.3c6ede9c.css 1 addition, 0 deletionspriv/static/adminfe/chunk-87b3.3c6ede9c.css
- priv/static/adminfe/chunk-88c9.184084df.css 1 addition, 1 deletionpriv/static/adminfe/chunk-88c9.184084df.css
- priv/static/adminfe/chunk-cf57.26596375.css 1 addition, 1 deletionpriv/static/adminfe/chunk-cf57.26596375.css
- priv/static/adminfe/index.html 1 addition, 1 deletionpriv/static/adminfe/index.html
- priv/static/adminfe/static/js/app.d2c3c6b3.js 0 additions, 2 deletionspriv/static/adminfe/static/js/app.d2c3c6b3.js
- priv/static/adminfe/static/js/app.d2c3c6b3.js.map 0 additions, 1 deletionpriv/static/adminfe/static/js/app.d2c3c6b3.js.map
- priv/static/adminfe/static/js/app.d898cc2b.js 2 additions, 0 deletionspriv/static/adminfe/static/js/app.d898cc2b.js
- priv/static/adminfe/static/js/app.d898cc2b.js.map 1 addition, 0 deletionspriv/static/adminfe/static/js/app.d898cc2b.js.map
- priv/static/adminfe/static/js/chunk-0d8f.6d50ff86.js 1 addition, 1 deletionpriv/static/adminfe/static/js/chunk-0d8f.6d50ff86.js
- priv/static/adminfe/static/js/chunk-0d8f.6d50ff86.js.map 1 addition, 1 deletionpriv/static/adminfe/static/js/chunk-0d8f.6d50ff86.js.map
Loading
Please register or sign in to comment