spc-pleroma/lib/pleroma/web/websub
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
..
websub.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
websub_client_subscription.ex Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
websub_controller.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
websub_server_subscription.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00