spc-pleroma/lib/pleroma/web/ostatus
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
..
handlers de-group alias/es 2019-02-09 16:31:17 +01:00
activity_representer.ex de-group alias/es 2019-02-09 16:31:17 +01:00
feed_representer.ex de-group alias/es 2019-02-09 16:31:17 +01:00
ostatus.ex de-group alias/es 2019-02-09 16:31:17 +01:00
ostatus_controller.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +07:00
user_representer.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00