Alex S bdfa3a6fa8 Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex		2019-05-01 12:29:33 +07:00
..
controllers	added healthcheck setting to instance config	2019-04-22 17:00:06 +07:00
representers	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
views	Fix `rights` in TwitterAPI's user entity being present only for	2019-04-28 19:42:43 +03:00
twitter_api.ex	Merging with develop	2019-05-01 12:29:33 +07:00
twitter_api_controller.ex	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00