Roman Chvanikov b1b1a270e8 Fix conflict		2019-06-05 02:45:21 +03:00
..
activity_pub	update ActivityPub#fetch_activities_query	2019-06-04 15:21:18 +03:00
admin_api
auth
channels
common_api	Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities	2019-06-04 13:38:32 +03:00
federator
mailer
mastodon_api	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
media_proxy	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
metadata
mongooseim
nodeinfo	nodeinfo: add pollLimits to metadata	2019-06-04 06:19:44 +00:00
oauth
ostatus
push
rich_media	Replace missing non-nullable Card attributes with empty strings	2019-05-30 21:03:31 +00:00
salmon
templates	Fix conflict	2019-06-05 02:45:21 +03:00
twitter_api	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
views
web_finger
websub
xml
chat_channel.ex
controller_helper.ex
endpoint.ex	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
gettext.ex
metadata.ex
oauth.ex
rel_me.ex
router.ex	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
streamer.ex	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
uploader_controller.ex
web.ex