summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-06 12:15:59 +0200
committerlain <lain@soykaf.club>2020-07-06 12:15:59 +0200
commit1963e143c5feace9eb9a3be29b0eeba2ad88751a (patch)
tree9a7ae160dd452db000e33af62f61057667c5953f /.gitlab
parent67d92ac7b7b977debac8f8e580db1f0e1ef3ed52 (diff)
parent69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff)
downloadpleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.tar.gz
pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
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