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

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

* upstream/develop:
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
parents ff18e339 f6e779a0
No related branches found
No related tags found
2 merge requests!1028`master` refresh with `develop`,!667MastoAPI support for followers/friends(following)
Pipeline #9547 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