mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

Thibaut Girka 66ad30db48 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.

2020-04-15 17:07:49 +02:00

chewy

Fix bookmarks also searchable (#13293 )

2020-03-22 02:40:03 +01:00

controllers

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-05 18:32:06 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-04 21:47:37 +02:00

javascript

[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists