You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md		4 years ago
..
activity_pub	Merge branch 'chores/note-handling-move' into 'develop'	4 years ago
admin_api	FrontendController: Return error on installation error.	4 years ago
api_spec	tests consistency	4 years ago
auth	tests consistency	4 years ago
common_api	Add local-only statuses	4 years ago
endpoint	phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+	4 years ago
feed	escaping summary and other fields in xml templates	4 years ago
mastodon_api	Merge branch 'develop' into 'hide-muted-reactions'	4 years ago
media_proxy	tests consistency	4 years ago
metadata	Merge branch 'develop' into refactor/discoverable_user_field	4 years ago
o_auth	Fix warnings	4 years ago
o_status	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	4 years ago
pleroma_api	Hide reactions from muted and blocked users	4 years ago
plugs	Remove unused aliases	4 years ago
preload/providers	update files consistency after rebase	4 years ago
push	Synchronize reaction notification text with PleromaFE's style	4 years ago
rich_media	changes after rebase	4 years ago
static_fe	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	4 years ago
twitter_api	Remove unused aliases	4 years ago
views	tests consistency	4 years ago
web_finger	tests consistency	4 years ago
chat_channel_test.exs	tests consistency	4 years ago
common_api_test.exs	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
fallback_test.exs	RedirectController: Don't replace title, but inject into the meta	4 years ago
federator_test.exs	tests consistency	4 years ago
media_proxy_test.exs	tests consistency	4 years ago
metadata_test.exs	Merge branch 'develop' into refactor/discoverable_user_field	4 years ago
mongoose_im_controller_test.exs	tests consistency	4 years ago
node_info_test.exs	tests consistency	4 years ago
rel_me_test.exs	tests consistency	4 years ago
streamer_test.exs	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
uploader_controller_test.exs	tests consistency	4 years ago
web_finger_test.exs	tests consistency	4 years ago