diff options
| author | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
| commit | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (patch) | |
| tree | c0057448e323c730bea2c76cecf9efb85ef14181 /.gitlab | |
| parent | 4a6389316dac53c1ca2ec36d160690476d881185 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.tar.gz pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.zip | |
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Bug.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 66fbc510e..dd0d6eb24 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -8,13 +8,11 @@ ### 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: -* PostgreSQL version (`postgres -V`): +* PostgreSQL version (`psql -V`): ### Bug description |