5168 Commits (f99b8a25ebd89a11ad3b98fa5815cc4fd338eeb1)

Author	SHA1	Message	Date
lain	f4469dc741	Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261	4 years ago
Haelwenn	bdc7b60610	Merge branch '1925-muting-reblogs' into 'develop' ... AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732	4 years ago
eugenijm	c2be0da79f	Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`	4 years ago
Haelwenn	68036f5a3b	Merge branch 'follow-pipeline' into 'develop' ... Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734	4 years ago
lain	6d688f14fa	Merge branch 'bugfix/status-deletion' into 'develop' ... #1920 fix activity deletion See merge request pleroma/pleroma!2721	4 years ago
lain	00e54f8fe7	ActivityPub: Remove `follow` and fix issues.	4 years ago
lain	9dda8b5427	CommonAPI: Switch to pipeline for following.	4 years ago
lain	172f4aff8e	Transmogrifier: Move following to the pipeline.	4 years ago
lain	7d0e2b3fdd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline	4 years ago
lain	cdc153db31	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880	4 years ago
lain	6335b32aa8	Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' ... [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731	4 years ago
Ivan Tashkinov	a6495f4a68	[#1895] credo fix.	4 years ago
lain	c0385cf47a	AccountController: Fix muting / unmuting reblogs.	4 years ago
Ivan Tashkinov	3f8370a285	[#1895] Applied code review suggestion.	4 years ago
Maksim Pechnikov	e341f81785	fixed delete `Like` activity in remove user	4 years ago
Haelwenn (lanodan) Monnier	31fef95e35	Add changelog and documentation	4 years ago
Haelwenn (lanodan) Monnier	312fc55f14	Add [:instances_favicons, :enabled] setting, defaults to false	4 years ago
Haelwenn (lanodan) Monnier	013e2c5057	Use instances table instead of Cachex	4 years ago
Haelwenn (lanodan) Monnier	6a679d80c9	Move get_favicon to Pleroma.Instances, use /	4 years ago
Haelwenn (lanodan) Monnier	f6d09fafee	Add support for remote favicons	4 years ago
Haelwenn	a8447c3803	Merge branch '1918-avatar-background-header-reset-2' into 'develop' ... Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729	4 years ago
Haelwenn	db13acf242	Merge branch 'fix/twitter-rich-media-preview' into 'develop' ... Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. Closes #1923 See merge request pleroma/pleroma!2730	4 years ago
lain	8939ff39e4	Merge branch 'remove-twitter-api' into 'develop' ... Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327	4 years ago
Ivan Tashkinov	3e08e77151	[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.	4 years ago
Mark Felder	18438a9bf0	Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.	4 years ago
lain	c8dd973af5	AccountController: Remove unused `update_?` routes. ... These were not documented and are also not used anymore.	4 years ago
lain	59cf78e412	AccountController: Allow removal / reset of user images.	4 years ago
lain	9ad305209a	Merge branch 'bugfix/peertube-videos' into 'develop' ... Fix getting videos from peertube See merge request pleroma/pleroma!2728	4 years ago
Haelwenn	fa0fa4552f	Merge branch 'feature/1392-support-irreversible-filters' into 'develop' ... Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186	4 years ago
Haelwenn (lanodan) Monnier	fbb9743a70	Fix getting videos from peertube	4 years ago
Haelwenn	d81acb5f62	Merge branch 'description-limits' into 'develop' ... Add limits to image descriptions See merge request pleroma/pleroma!2724	4 years ago
lain	a6a12b241f	FollowValidator: Add basic validation.	4 years ago
lain	28feba8af4	Preloaders: Remove status_net preloader	4 years ago
lain	1963e143c5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api	4 years ago
lain	208baf157a	ActivityPub: Add new 'capabilities' to user.	4 years ago
lain	74b88c0a8b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
lain	cc8b4e48d9	InstanceView: Add chat limit, description limit	4 years ago
Alexander Strizhakov	20c27bef40	renaming back and reject nil on create	4 years ago
Sergey Suprunenko	8277b29790	Restrict thread statuses that contain user's irreversible filters	4 years ago
Sergey Suprunenko	4a8c26654e	Restrict statuses that contain user's irreversible filters	4 years ago
Roman Chvanikov	fc1f34b851	Delete activity before sending response to client	4 years ago
lain	cf56655614	Streamer: Don't filter out announce notifications.	4 years ago
lain	c2a052a346	Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' ... MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690	4 years ago
lain	d3efb50262	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	4 years ago
lain	945e75c8e8	SearchController: Trim query.	4 years ago
lain	e3b5559780	AccountController: Make setting accepts_chat_messages possible.	4 years ago
lain	4a7b89e372	ChatMessageValidator: Additional validation.	4 years ago
lain	3ca9af1f9f	Account Schema: Add `accepts_chat_messages`	4 years ago
lain	5c0bf4c472	ActivityPub: Ingest information about chat acceptance.	4 years ago
lain	26a7cc3f00	UserView: Add acceptsChatMessages field	4 years ago
lain	3250228be9	AccountView: Add 'accepts_chat_messages' to view.	4 years ago
Mark Felder	8121e46f25	Merge branch 'develop' into activation-meta	4 years ago
Mark Felder	d44ec2bf4c	Remove camelCase from the keys	4 years ago
rinpatch	4c044f6225	Merge branch 'fetcher-fixes' into 'develop' ... Don't fail fetching when the user in a replied-to message can't be fetched. See merge request pleroma/pleroma!2711	4 years ago
lain	bad08f34ca	Credo fixes.	4 years ago
lain	311b7c19d0	Streamer: Align announce streaming with polling.	4 years ago
lain	61fe94d698	SideEffects: Refactor.	4 years ago
lain	fedfe8f7d6	ActivityPub: Handle clashing nicknames for the same ap id ... If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.	4 years ago
lain	ce92e6e5ce	Fetcher: Work when we can't get the OP.	4 years ago
Alex Gleason	8daacc9114	AutoLinker --> Linkify, update to latest version ... https://git.pleroma.social/pleroma/elixir-libraries/linkify	4 years ago
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Mark Felder	0883a706dc	Merge branch 'develop' into activation-meta	4 years ago
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
lain	8b7055e25e	Credo fixes	4 years ago
lain	0176b7bca2	Merge branch 'preload-fixups-2' into preloadfixups	4 years ago
lain	2382a2a151	Preload: Load the correct instance panel	4 years ago
Egor Kislitsyn	979f02ec94	Fix CastAndValidate plug	4 years ago
Egor Kislitsyn	67d92ac7b7	Remove `/statusnet/config`	4 years ago
Egor Kislitsyn	8693e01799	Fix warning	4 years ago
Egor Kislitsyn	4a306720e8	Merge branch 'develop' into remove-twitter-api	4 years ago
lain	59540131c1	Credo fixes.	4 years ago
lain	f308196b75	Token Response: Remove empty file.	4 years ago
lain	e374872fe7	AccountOperation: Correctly describe create response.	4 years ago
lain	bb168ed94a	OAuth: Extract view-type functions to a view.	4 years ago
lain	8630a6c7f5	Preloaders: Use strings as keys.	4 years ago
lain	a19f8778af	User preloader: Put user info at correct key	4 years ago
lain	577da132da	Merge branch '1031-parent-visible' into 'develop' ... Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679	4 years ago
Haelwenn (lanodan) Monnier	9f51b03eed	ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses	4 years ago
Haelwenn (lanodan) Monnier	244655e884	MastoAPI: Show source field when deleting	4 years ago
Mark Felder	69848d5c97	Rename notification "privacy_option" setting	4 years ago
Haelwenn	bf1c5e255a	Merge branch 'block-handling' into 'develop' ... Handle blocks with the pipeline See merge request pleroma/pleroma!2685	4 years ago
Haelwenn	09478c9cf7	Merge branch '1258-anti-link-spam-exemption' into 'develop' ... AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request pleroma/pleroma!2686	4 years ago
Mark Felder	fd5e797379	Simplify notification filtering settings further	4 years ago
Mark Felder	b950fb01db	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	f378e93bf4	AccountController: Return scope in proper format.	4 years ago
lain	a2002ebb63	Preloading: Fix nodeinfo url.	4 years ago
lain	4a7a34ae8c	Preloading: Return correct data for statusnet stuff.	4 years ago
lain	7ed2296416	Nodeinfo: Add chat information back in.	4 years ago
lain	15a8b70318	User: Don't unfollow on block when the relevant setting is set.	4 years ago
lain	c3383d4fab	BlockValidator: Restore old behavior for incoming blocks.	4 years ago
Haelwenn (lanodan) Monnier	27c33f216a	activity_draft: Add source field	4 years ago
Haelwenn (lanodan) Monnier	d6c958b4c2	nodeinfo: Fix MRF transparency	4 years ago
feld	8288419686	Merge branch 'preload-data' into 'develop' ... Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381	4 years ago
Mark Felder	433c01b370	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	04abee782b	AntiSpamLinkPolicy: Exempt local users.	4 years ago
lain	84f9ca1956	Blocking: Don't federate if the options is set.	4 years ago
lain	44bb7cfccd	ActivityPub: Remove `block`.	4 years ago
lain	8cfb58a8c0	AccountController: Extract blocking to CommonAPI.	4 years ago
lain	e38293c8f1	Transmogrifier: Switch to pipeline for Blocks.	4 years ago
lain	89e5b2046b	ObjectValidator: Basic `Block` support.	4 years ago
lain	4c5fb831b3	Status schema: Add parent_visible.	4 years ago
lain	35f6770436	StatusView: Add pleroma.parent_visible	4 years ago
lain	88ccade1cb	Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' ... admin api status count per instance See merge request pleroma/pleroma!2500	4 years ago
lain	98af7b59e4	Merge branch 'update-validator' into 'develop' ... Update validator See merge request pleroma/pleroma!2668	4 years ago
Roman Chvanikov	1471b70ef1	Merge develop	4 years ago
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	4 years ago
lain	aee815b478	ObjectValidator: Clarify type of object.	4 years ago
lain	2c603f2009	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator	4 years ago
Haelwenn (lanodan) Monnier	c116b6d6d6	ActivityPubController: Update upload_media @doc ... Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810	4 years ago
Haelwenn	d21ef5e66b	Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' ... Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672	4 years ago
Mark Felder	df5e048cbb	Do not need a function to provide fallback value with default defined in config.exs	4 years ago
Haelwenn	98f014d3be	Merge branch 'warning/mastofe-settings-blob' into 'develop' ... Add warning against parsing/reusing MastoFE settings blob See merge request pleroma/pleroma!2671	4 years ago
Haelwenn (lanodan) Monnier	8f6ba4b22f	Add warning against parsing/reusing MastoFE settings blob	4 years ago
lain	46f7e51b27	Merge branch 'add-muted-to-notifications' into 'develop' ... Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670	4 years ago
Egor Kislitsyn	b3a549e916	Update NotificationOperation spec	4 years ago
Egor Kislitsyn	7e6f43c0d7	Add `is_muted` to notifications	4 years ago
lain	59bdef0c33	Merge branch 'feature/1739-account-endpoints' into 'develop' ... account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488	4 years ago
lain	8b5bdd164e	Merge branch 'fix/1825-admin-api-error-codes' into 'develop' ... Proper error codes for error in adminFE Closes #1825 See merge request pleroma/pleroma!2665	4 years ago
lain	b05f795326	Credo fixes	4 years ago
lain	e785cd5cae	ActivityPub: Remove `update` and switch to pipeline.	4 years ago
rinpatch	c75ba63bef	Merge branch '1865-media-only' into 'develop' ... Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650	4 years ago
lain	9438f83f83	Transmogrifier: Handle `Update` with the pipeline.	4 years ago
lain	31a4d42ce0	SideEffects: Handle user updating.	4 years ago
rinpatch	282f492cd5	Merge branch '1883-mrf-chat' into 'develop' ... HellthreadPolicy: Restrict to Notes and Articles. Closes #1883 See merge request pleroma/pleroma!2666	4 years ago
lain	93ae1c8bd3	Merge branch 'feature/1854-emoji-pagination' into 'develop' ... Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658	4 years ago
lain	35e9282ffd	HellthreadPolicy: Restrict to Notes and Articles.	4 years ago
Alexander Strizhakov	b5f13af7ba	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex	4 years ago
Alexander Strizhakov	c5863438ba	proper error codes for error in adminFE	4 years ago
lain	31761340fe	Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop' ... Support 'bot' field in account update_credentials Closes #1600 and #1467 See merge request pleroma/pleroma!2662	4 years ago
lain	0e789bc55f	Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex	4 years ago
lain	7d542450b1	Merge branch 'develop' into '1865-media-only' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn (lanodan) Monnier	3d4cfc9c5f	Stop filling conversation field on incoming objects (legacy, unused) ... conversation field is still set for outgoing federation for compatibility.	4 years ago
feld	f928267773	Merge branch 'issue/1855' into 'develop' ... #1855 MediaProxy cache invalidation via Admin API See merge request pleroma/pleroma!2648	4 years ago
Sergey Suprunenko	ac0344dd24	Only accounts with Service actor_type are considered as bots	4 years ago
Sergey Suprunenko	b63646169d	Add support for bot field in update_credentials	4 years ago
lain	75670a99e4	UpdateValidator: Only allow updates from the user themselves.	4 years ago
lain	abdb540d45	ObjectValidators: Add basic UpdateValidator.	4 years ago
Ivan Tashkinov	5237a2df9f	[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.	4 years ago
Alexander Strizhakov	02ca8a363f	default page size for files	4 years ago
Alexander Strizhakov	3e3f9253e6	adding overall count for packs and files	4 years ago
Alexander Strizhakov	4975ed86bc	emoji pagination for pack show action	4 years ago
Alexander Strizhakov	3becdafd33	emoji packs pagination	4 years ago
Maksim Pechnikov	4044f24e2e	fix test	4 years ago
Mark Felder	2731ea1334	Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url	4 years ago
Mark Felder	c08c9db0c1	Remove misleading is_ prefix from boolean function	4 years ago
Mark Felder	71a5d9bffb	Empty list as default	4 years ago
Mark Felder	3462d4b995	Merge branch 'develop' into issue/1855	4 years ago
lain	d772361e62	Merge branch 'fix/1787-mogrify-args' into 'develop' ... Moving custom ecto types in context folders See merge request pleroma/pleroma!2652	4 years ago
Egor Kislitsyn	d4b5a9730e	Remove `poll` from `notification_type` OpenAPI spec	4 years ago
Maksim	9a371bf5f6	Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex	4 years ago
Maksim	44ce97a9c9	Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex	4 years ago
Maksim	74fd761637	Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex	4 years ago
rinpatch	4ec2fb967e	Merge branch 'features/users-raw_bio' into 'develop' ... User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326	4 years ago
Alexander Strizhakov	a77b0388f4	credo fix	4 years ago
Haelwenn	b536e57124	Merge branch '1866-last-status-stuff' into 'develop' ... Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
Alexander Strizhakov	3c2cee33ad	moving custom ecto types in context folders	4 years ago
Alexander Strizhakov	9a4fde9766	Mogrify args as custom tuples	4 years ago
lain	1eb6cedaad	ActivityPub: When restricting to media posts, only show 'Creates'.	4 years ago
stwf	faba1a6e33	fix tests	4 years ago
Maksim Pechnikov	579763126f	Merge branch 'develop' into issue/1855	4 years ago
Egor Kislitsyn	58e4e3db8b	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
Maksim Pechnikov	62b8c31b7a	added tests	4 years ago
lain	b7df7436c8	Conversations: Return last dm for conversation, not last message.	4 years ago
Maksim Pechnikov	2e8a236cef	fix invalidates media url's	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
rinpatch	271ea5068f	Merge branch '1851-favorites-pagination' into 'develop' ... StatusController: Correctly paginate favorites. Closes #1851 See merge request pleroma/pleroma!2636	4 years ago
lain	1d625c29a0	ControllerHelper: Always return id field.	4 years ago
lain	4b865bba10	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
href	cb7be6eef2	Remove use of atoms in MRF.UserAllowListPolicy	4 years ago
Egor Kislitsyn	520367d6fd	Fix atom leak in Rich Media Parser	4 years ago
Mark Felder	26f710b9e3	Merge branch 'develop' into preload-data	4 years ago
Haelwenn	4115701f71	Merge branch 'recipients-experiments' into 'develop' ... ActivityPub: Don't show announces of your own objects in timeline. See merge request pleroma/pleroma!2637	4 years ago
Egor Kislitsyn	09d31d24de	Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2	4 years ago
Egor Kislitsyn	697cf92024	Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers	4 years ago
lain	e557265a03	Merge branch 'global-status-expiration' into 'develop' ... Global status expiration See merge request pleroma/pleroma!2208	4 years ago
Maksim Pechnikov	f9dcf15ecb	added admin api for MediaProxy cache invalidation	4 years ago
Ivan Tashkinov	2188097066	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
Egor Kislitsyn	2419776e19	Deprecate Pleroma.Web.RichMedia.Parsers.OGP	4 years ago
Egor Kislitsyn	1f35acce54	Merge OGP parser with TwitterCard	4 years ago
Ivan Tashkinov	b28cec4271	[#1794] Fixes URI query handling for hashtags extraction in search.	4 years ago
lain	5e44e9d698	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
rinpatch	7aa6c82937	Merge branch 'remake-remodel-dms' into 'develop' ... Chats / ChatMessages See merge request pleroma/pleroma!2429	4 years ago
lain	9e411372d0	ActivityPub: Don't show announces of your own objects in timeline.	4 years ago
lain	86fec45f40	ControllerHelper: Fix wrong comparison.	4 years ago
lain	b4c50be9df	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	be7c322865	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	c4f267b3be	Apply suggestion to lib/pleroma/web/controller_helper.ex	4 years ago
lain	1b746cfbbb	Merge branch 'add-url-to-admin-account-view' into 'develop' ... Add `url` field to AdminAPI.AccountView See merge request pleroma/pleroma!2633	4 years ago
Egor Kislitsyn	3dd1de61a7	Add `url` field to AdminAPI.AccountView	4 years ago
lain	063e6b9841	StatusController: Correctly paginate favorites. ... Favorites were paginating wrongly, because the pagination headers where using the id of the id of the `Create` activity, while the ordering was by the id of the `Like` activity. This isn't easy to notice in most cases, as they usually have a similar order because people tend to favorite posts as they come in. This commit adds a way to give different pagination ids to the pagination helper, so we can paginate correctly in cases like this.	4 years ago
lain	064c4f86f3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn (lanodan) Monnier	fe1cb56fdc	transmogrifier: MIME.valid?/1 for mediaType ... No issues with the rest of the network yet but this makes sure it will work once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 is merged.	4 years ago
Roman Chvanikov	604a83ae3e	merge develop	4 years ago
Egor Kislitsyn	d44843e677	Restrict ActivityExpirationPolicy to Notes only	4 years ago
Egor Kislitsyn	da22119c2f	Merge branch 'develop' into global-status-expiration	4 years ago
lain	d192492658	Merge branch 'openapi/admin/relay' into 'develop' ... Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579	4 years ago
lain	3b5282bef2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	89b85f6529	ChatController: Remove nonsensical pagination.	4 years ago
lain	7d66dd180a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago