diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-02 23:58:02 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-02 23:58:02 +0000 |
| commit | 0a05ebf789ae90fddce4bc1918e7c28d13b7f2bb (patch) | |
| tree | 6ab4889ffa2ef637226def90eb0758d338ef19b6 /priv | |
| parent | e22a7722403fb3a6eb147f16de0c021d3d8c0f5f (diff) | |
| parent | b439e91f57d1d7f26e94acc62703a64c747773da (diff) | |
| download | pleroma-0a05ebf789ae90fddce4bc1918e7c28d13b7f2bb.tar.gz pleroma-0a05ebf789ae90fddce4bc1918e7c28d13b7f2bb.zip | |
Merge branch 'revert-01239456' into 'develop'
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
See merge request pleroma/pleroma!3742
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions