Haelwenn d81acb5f62 Merge branch 'description-limits' into 'develop' ... Add limits to image descriptions See merge request pleroma/pleroma!2724		2020-07-07 03:00:52 +00:00
..
activity_pub	Merge branch 'fetcher-fixes' into 'develop'	2020-07-02 10:17:51 +00:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	2020-07-03 16:44:31 +02:00
auth	…
channels	…
common_api	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	2020-07-03 16:44:31 +02:00
federator	…
feed	…
mailer	…
mastodon_api	InstanceView: Add chat limit, description limit	2020-07-06 11:12:37 +02:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata	…
mongooseim	…
nodeinfo	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
oauth	…
ostatus	…
pleroma_api	adding overall count for packs and files	2020-06-19 10:17:24 +03:00
preload	Credo fixes	2020-06-30 11:55:58 +02:00
push	…
rich_media	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	2020-06-15 16:03:40 +04:00
static_fe	…
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
templates	…
twitter_api	…
views	Rename user.settings column	2020-06-30 11:50:53 -05: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	…
preload.ex	…
rel_me.ex	…
router.ex	Merge branch 'preload-data' into 'develop'	2020-06-25 21:35:39 +00:00
translation_helpers.ex	…
uploader_controller.ex	…
web.ex	…