summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-06 12:07:56 +0200
committerlain <lain@soykaf.club>2020-07-06 12:07:56 +0200
commited4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548 (patch)
tree82c5e8b4a40495485533b9c95668cef39ce909d2 /.gitlab
parenta5bbfa21a1fabe97bfff1cc80348d2944319f3ad (diff)
parent69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff)
downloadpleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.tar.gz
pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/issue_templates/Bug.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 66fbc510e..9ce9b6918 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -14,7 +14,7 @@
* 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