diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 |
| commit | 2def3cbf417075146da5e54201e9b969e6aa3eca (patch) | |
| tree | 93cdf149a1874f56d2808598f8aeee15e60c8a10 /rel | |
| parent | 56ddf20208657487bf0298409cf91b11dac346ff (diff) | |
| parent | 686002164a5ab63ccb22cff015faf87f8f7fc9ec (diff) | |
| download | pleroma-2def3cbf417075146da5e54201e9b969e6aa3eca.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# mix.lock
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions