Merge branch 'develop' into bugfix/web-notification-special-char
No related branches found
No related tags found
Showing
- .gitignore 0 additions, 1 deletion.gitignore
- CHANGELOG.md 14 additions, 3 deletionsCHANGELOG.md
- config/config.exs 6 additions, 3 deletionsconfig/config.exs
- docs/api/differences_in_mastoapi_responses.md 23 additions, 2 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/api/pleroma_api.md 74 additions, 1 deletiondocs/api/pleroma_api.md
- docs/config.md 7 additions, 0 deletionsdocs/config.md
- docs/config/custom_emoji.md 5 additions, 0 deletionsdocs/config/custom_emoji.md
- lib/healthcheck.ex 60 additions, 0 deletionslib/healthcheck.ex
- lib/mix/tasks/pleroma/emoji.ex 4 additions, 4 deletionslib/mix/tasks/pleroma/emoji.ex
- lib/mix/tasks/pleroma/user.ex 10 additions, 10 deletionslib/mix/tasks/pleroma/user.ex
- lib/pleroma/PasswordResetToken.ex 1 addition, 1 deletionlib/pleroma/PasswordResetToken.ex
- lib/pleroma/bookmark.ex 60 additions, 0 deletionslib/pleroma/bookmark.ex
- lib/pleroma/gopher/server.ex 1 addition, 1 deletionlib/pleroma/gopher/server.ex
- lib/pleroma/html.ex 25 additions, 4 deletionslib/pleroma/html.ex
- lib/pleroma/list.ex 1 addition, 1 deletionlib/pleroma/list.ex
- lib/pleroma/notification.ex 1 addition, 1 deletionlib/pleroma/notification.ex
- lib/pleroma/object/fetcher.ex 1 addition, 1 deletionlib/pleroma/object/fetcher.ex
- lib/pleroma/user.ex 24 additions, 36 deletionslib/pleroma/user.ex
- lib/pleroma/user/info.ex 2 additions, 8 deletionslib/pleroma/user/info.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 4 additions, 3 deletionslib/pleroma/web/activity_pub/activity_pub.ex
Loading
Please register or sign in to comment