diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
| commit | a08196ca680554315e088e9ea4191f292bbe2642 (patch) | |
| tree | e38dad4a9fd0d566859755aec6c40f4f3a62fd2d /uploads | |
| parent | 6a567a131ec04dbeb71012f2caeebf563ed453a4 (diff) | |
| parent | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (diff) | |
| download | pleroma-fix/disable-favicons-in-tests.tar.gz | |
Merge branch 'develop' into 'fix/disable-favicons-in-tests'fix/disable-favicons-in-tests
# Conflicts:
# config/test.exs
Diffstat (limited to 'uploads')
0 files changed, 0 insertions, 0 deletions