Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit b20b2c5

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 3044dab + 1c65a9d commit b20b2c5

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ root = true
66

77
[*]
88
charset = utf-8
9-
indent_size = 2
9+
indent_size = 4
1010
indent_style = space
1111
end_of_line = lf
1212
insert_final_newline = true

.github/labels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
description: "For known bugs"
1010
from_name: "bug"
1111
- # Urgent
12-
name: "Blocker :triangular_flag_on_post:"
13-
color: "FFFFFF"
14-
description: "Release blocker"
12+
name: "Urgent :bomb:"
13+
color: "ED7014"
14+
description: "Urgent"
1515
- # dependencies
1616
name: "dependencies :man_cook:"
1717
color: "0366d6"
@@ -67,7 +67,7 @@
6767
- # Blocker
6868
name: "Blocker :triangular_flag_on_post:"
6969
color: "ff0000"
70-
description: "Urgent bug, blocking release"
70+
description: "Show Stopper"
7171
- # Website
7272
name: "Website :technologist:"
7373
color: "FFFFFF"

.gitignore

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Jetbrains
22
/*.iml
33
/.idea
4-
/.idea/.gitignore
5-
/.idea/deployment.xml
6-
/.idea/discord.xml
7-
/.idea/module-perl.iml
8-
/.idea/modules.xml
9-
/.idea/php.xml
10-
/.idea/vcs.xml
114

125
# Bearsampp
136
/.dev
@@ -16,3 +9,6 @@
169
.vscode/
1710
.vs/
1811
.vsc/
12+
13+
# ignore "current" directories
14+
/**/current

0 commit comments

Comments
 (0)