Skip to content
Snippets Groups Projects
Commit ff18e339 authored by HJ's avatar HJ :fire:
Browse files

Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 

* upstream/develop:
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
parents 0a031aae 987b5162
No related branches found
No related tags found
2 merge requests!1028`master` refresh with `develop`,!667MastoAPI support for followers/friends(following)
Pipeline #9546 passed
Stage: lint
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment