Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320		2020-06-23 16:38:27 +00:00
..
activity_pub	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'	2020-06-23 16:38:27 +00:00
admin_api	proper error codes for error in adminFE	2020-06-20 13:53:57 +03:00
api_spec	Merge branch 'add-muted-to-notifications' into 'develop'	2020-06-22 15:40:09 +00:00
auth
channels
common_api	Merge branch 'global-status-expiration' into 'develop'	2020-06-12 14:14:09 +00:00
federator
feed	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	2020-06-05 23:15:10 +04:00
mailer
mastodon_api	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'	2020-06-23 16:38:27 +00:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata
mongooseim
nodeinfo
oauth	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})	2020-06-05 14:48:02 +00:00
ostatus	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	adding overall count for packs and files	2020-06-19 10:17:24 +03:00
push	WebPush: Don't break on contentless chat messages.	2020-06-06 09:46:07 +02:00
rich_media	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-15 16:03:40 +04:00
static_fe	Use atoms as keys in ActivityPub.fetch_* functions options	2020-06-04 21:36:26 +04:00
streamer	ChatMessageReference -> Chat.MessageReference	2020-06-06 11:51:10 +02:00
templates	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	2020-06-01 17:38:57 +04:00
twitter_api
views	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-06-05 16:53:56 +02:00
web_finger
xml
api_spec.ex
chat_channel.ex
controller_helper.ex	ControllerHelper: Always return id field.	2020-06-13 13:12:43 +02:00
embed_controller.ex
endpoint.ex
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex	Add warning against parsing/reusing MastoFE settings blob	2020-06-22 23:45:29 +02:00
metadata.ex
oauth.ex
rel_me.ex
router.ex	Add warning against parsing/reusing MastoFE settings blob	2020-06-22 23:45:29 +02:00
translation_helpers.ex
uploader_controller.ex
web.ex