diff options
| author | feld <feld@feld.me> | 2020-11-18 21:16:12 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-20 21:30:04 +0000 |
| commit | ba3bf16c701e8028bc7345b34c0d6d75151cacc6 (patch) | |
| tree | 7b37f5886e397a63a204a4b5f35a5faacc926698 /lib | |
| parent | 3e7642b123929593a3f414f63d1708ead11f47b0 (diff) | |
| download | pleroma-ba3bf16c701e8028bc7345b34c0d6d75151cacc6.tar.gz | |
Merge branch 'revert-da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
(cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b)
42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions