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
..
mrf	wow	2019-02-08 15:12:13 +03:00
views	de-group alias/es	2019-02-09 16:31:17 +01:00
activity_pub_controller.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-11 13:54:21 +07:00
activity_pub.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-11 13:54:21 +07:00
mrf.ex	update copyright years to 2019	2018-12-31 15:41:47 +00:00
relay.ex	de-group alias/es	2019-02-09 16:31:17 +01:00
transmogrifier.ex	de-group alias/es	2019-02-09 16:31:17 +01:00
utils.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-11 13:54:21 +07:00