You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
websub.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	6 years ago
websub_client_subscription.ex	Flake Ids for Users and Activities	6 years ago
websub_controller.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	6 years ago
websub_server_subscription.ex	update copyright years to 2019	6 years ago