Skip to content

Commit 1d46b7f

Browse files
authored
Merge branch 'master' into patch-crossref
2 parents 5c9bef5 + 06d0b56 commit 1d46b7f

File tree

441 files changed

+18407
-8433
lines changed

Some content is hidden

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

441 files changed

+18407
-8433
lines changed

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at https://editorconfig.org
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 4
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.bat]
13+
end_of_line = crlf

.gitattributes

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Define the line ending behavior of the different file extensions
2+
# Set the default behavior, in case people don't have core.autocrlf set.
3+
* text text=auto eol=lf
4+
5+
# Declare files that will always have CRLF line endings on checkout.
6+
*.bat eol=crlf
7+
8+
# Denote all files that are truly binary and should not be modified.
9+
*.png binary
10+
*.jpg binary
11+
*.gif binary
12+
*.jpeg binary
13+
*.zip binary
14+
*.phar binary
15+
*.ttf binary
16+
*.woff binary
17+
*.eot binary
18+
*.ico binary
19+
*.mo binary
20+
*.pdf binary
21+
*.xcf binary
22+
*.eps binary
23+
*.psd binary
24+
*.doc binary
25+
26+
# Remove files for archives generated using `git archive`
27+
phpstan.neon export-ignore
28+
phpstan-baseline.neon export-ignore linguist-generated=true
29+
.travis.yml export-ignore
30+
.editorconfig export-ignore
31+
.gitattributes export-ignore
32+
.gitignore export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea/
12
vendor/
23
composer.phar
34
/composer.lock

.license

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* This file is part of the Propel package.
3+
* For the full copyright and license information, please view the LICENSE
4+
* file that was distributed with this source code.
5+
*
6+
* @license MIT License
7+
*/

0 commit comments

Comments
 (0)