Ivan Tashkinov
ee04fbc35a
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs |
4 vuotta sitten | |
---|---|---|
.. | ||
admin_api.md | [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation | 4 vuotta sitten |
differences_in_mastoapi_responses.md | Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints | 4 vuotta sitten |
pleroma_api.md | Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read | 4 vuotta sitten |
prometheus.md | Rename some directories because MkDocs uses them for categories | 4 vuotta sitten |