Skip to content

Commit 3078627

Browse files
committed
Merge branch 'release/v19.10.0'
2 parents 83cdeb5 + ae54e7c commit 3078627

File tree

154 files changed

+896
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+896
-350
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
*.pdf diff=astextplain
2020
*.PDF diff=astextplain
2121
*.rtf diff=astextplain
22-
*.RTF diff=astextplain
22+
*.RTF diff=astextplain

.github/ISSUE_TEMPLATE/new-server-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ If yes Use SteamDB to get the appid. (https://steamdb.info).
2626
We only support Linux servers and do not support Wine.
2727

2828
* [ ] Yes
29-
* [ ] No
29+
* [ ] No

.github/potential-duplicates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ referenceComment: >
1010
Potential duplicates:
1111
{{#issues}}
1212
- [#{{ number }}] {{ title }} ({{ accuracy }}%)
13-
{{/issues}}
13+
{{/issues}}

.github/pull_request_template.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,11 @@ PR will not be merged until all steps are complete.
1919
* [ ] This pull request links to an issue.
2020
* [ ] This pull request uses the `develop` branch as its base.
2121
* [ ] This code follows the style guidelines of this project.
22-
* [ ] I have provided Co-author details below.
2322
* [ ] I have performed a self-review of my own code.
2423
* [ ] I have checked that this code is commented where required.
2524
* [ ] I have provided a detailed enough description of this PR.
2625
* [ ] I have checked If documentation needs updating.
2726

28-
## Provide Github Email
29-
30-
Fill out below info or tick box below:
31-
```
32-
Co-authored-by: John Doe <[email protected]>
33-
```
34-
35-
- [ ] I do not wish to provide an email. I am aware this will hide me as the author of this commit.
36-
37-
All pull requests will now be squashed to create a tidy commit history and simplify changelog creation. You can provide either your own email or a GitHub-provided no-reply email.
38-
39-
When a PR is squashed the author becomes the person who squashed the PR. This removes you as the author of your own PR.
40-
The only workaround for this is to add your details as a co-author. More info about co-authors can be found [here](https://help.github.com/en/articles/creating-a-commit-with-multiple-authors).
41-
4227
## Documentation
4328

4429
If documentation does need updating either update it by creating a PR (preferred) or request a documentation update.

.github/request-info.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# *Required* Comment to reply with
44
requestInfoReplyComment: >
55
![More Data required](https://i.imgur.com/yS9cecv.png)
6-
More data is required to assist with this issue
6+
More data is required to assist with this issue
77
or issue template was not used correctly.
88
https://linuxgsm.com/support/#guide
99
@@ -14,4 +14,4 @@ requestInfoReplyComment: >
1414
# - updates
1515

1616
# *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given
17-
requestInfoLabelToAdd: "needs more info"
17+
requestInfoLabelToAdd: "needs more info"

.github/topissuebot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Configuration for top-issue-bot
22
labelName: ":thumbsup: Top Issue!"
33
labelColor: "f442c2"
4-
numberOfIssuesToLabel: 5
4+
numberOfIssuesToLabel: 5

.github/welcome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ newPRWelcomeComment: >
1818
firstPRMergeComment: >
1919
Congratulations on merging your first pull request! Thank you for supporting LinuxGSM!
2020
21-
# It is recommend to include as many gifs and emojis as possible
21+
# It is recommend to include as many gifs and emojis as possible

.github/write-good.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# .github/write-good.yml
22
writeGood: true
33
alex: true
4-
spellchecker: true
4+
spellchecker: true

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
*.db
2-
.idea
2+
.idea

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ This will help us in understanding your code and determining where problems may
3333
Start reading our code and you'll get the hang of it. Explore how functions are organized and you'll see how we strive for readable code.
3434

3535
Please give the following document a read and adjust your code according to its specifications.
36-
[Syntax & Coding Conventions](https://github.com/GameServerManagers/LinuxGSM/wiki/Syntax-and-Conventions)
36+
[Syntax & Coding Conventions](https://github.com/GameServerManagers/LinuxGSM/wiki/Syntax-and-Conventions)

0 commit comments

Comments
 (0)