diff options
| author | feld <feld@feld.me> | 2020-11-18 21:16:12 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-18 21:16:12 +0000 |
| commit | 8a7ee9fe74f64680da366b0da51038bed022061b (patch) | |
| tree | 6b89592fbf79f2ad8da74800db6a9d33be765b16 /test/instance_static/add | |
| parent | a1056aace19d5f6201f06937a93f978917df8418 (diff) | |
| parent | 42ff5ea95eca6424066e0efbce1d05562414652f (diff) | |
| download | pleroma-8a7ee9fe74f64680da366b0da51038bed022061b.tar.gz | |
Merge branch 'revert-da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
Diffstat (limited to 'test/instance_static/add')
0 files changed, 0 insertions, 0 deletions