Skip to content

Commit 11c9741

Browse files
OldiesmannOldiesmann
authored
Merge branch 'release-3.0' into cloudflare_cdn
2 parents c1f6797 + 5effc28 commit 11c9741

File tree

1,971 files changed

+136811
-62323
lines changed

Some content is hidden

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

1,971 files changed

+136811
-62323
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ root = true
22

33
[*]
44
end_of_line = lf
5-
insert_final_newline = false
5+
insert_final_newline = true
66
indent_style = tab
77
indent_size = tab
88
tab_width = 4
99
trim_trailing_whitespace = true
1010
charset = utf-8
1111

12+
[*.lock]
13+
indent_style = space
14+
1215
[*.yml]
1316
indent_style = space
14-
indent_size = 2
17+
indent_size = 2

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
2+
# https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
3+
4+
74e835324fbdbc594b2e67b068e548e541a163da

‎.github/crowdin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ files: [
5959
translation: "Languages/%locale_with_underscore%/Help.php",
6060
},
6161
{
62-
source: "Languages/en_US/Install.php",
63-
translation: "Languages/%locale_with_underscore%/Install.php",
62+
source: "Languages/en_US/Maintenance.php",
63+
translation: "Languages/%locale_with_underscore%/Maintenance.php",
6464
},
6565
{
6666
source: "Languages/en_US/Login.php",

‎.github/phpcs/SMFClosingTag.php‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)