diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
| commit | bdf57b8ef438f32999ef917777b13161320644a8 (patch) | |
| tree | b72dc8ce2621eeb25e14504d6ce73c6657fac571 /.gitlab | |
| parent | 9faa63203717e71d666afb6755ff0b781b491823 (diff) | |
| parent | f0d13fc3f7d0e9b58cfe1cd8918072d45d656a31 (diff) | |
| download | pleroma-bdf57b8ef438f32999ef917777b13161320644a8.tar.gz pleroma-bdf57b8ef438f32999ef917777b13161320644a8.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Bug.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 9ce9b6918..dd0d6eb24 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -8,9 +8,7 @@ ### Environment -* Installation type: - - [ ] OTP - - [ ] From source +* Installation type (OTP or From Source): * Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): * Elixir version (`elixir -v` for from source installations, N/A for OTP): * Operating system: |