Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex		2021-02-11 19:31:57 +03:00
..
email	Fix for dropping posts/notifs in WS when mix task is executed	2020-12-14 11:02:32 -06:00
embed	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).	2021-01-28 19:49:43 +03:00
feed/feed	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-11 19:31:57 +03:00
layout	OAuth form user remembering feature. Local MastoFE login / logout fixes.	2020-11-28 21:51:06 +03:00
mailer/subscription
masto_fe
o_auth	OAuth form user remembering feature. Local MastoFE login / logout fixes.	2020-11-28 21:51:06 +03:00
static_fe/static_fe	static_fe: Add microformats2 classes	2020-04-22 16:02:40 +02:00
twitter_api	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00