summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-03 16:44:31 +0200
committerlain <lain@soykaf.club>2020-07-03 16:44:31 +0200
commitd3efb50262e7922fc1aa80625679a7e29bb65836 (patch)
tree1b9c37c851739b041462a5bf50864a4c5d24ffd8 /.gitlab
parent244655e884130df6dccabc0d2d78d33857809a36 (diff)
parent19fbfbb767169b58a8f6558d0ad1a9be6425b59d (diff)
downloadpleroma-d3efb50262e7922fc1aa80625679a7e29bb65836.tar.gz
pleroma-d3efb50262e7922fc1aa80625679a7e29bb65836.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
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