Skip to content

Commit

Permalink
Merge pull request #501 from flightphp/master
Browse files Browse the repository at this point in the history
Merging all new changes with OG framework
  • Loading branch information
n0nag0n authored Jan 2, 2024
2 parents 2df64f3 + 49c446f commit 2df12f9
Show file tree
Hide file tree
Showing 38 changed files with 1,474 additions and 375 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
indent_size = 2
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
vendor/
composer.phar
composer.lock
.phpunit.result.cache
coverage/
.vscode/settings.json
*.sublime-workspace
.vscode/
Loading

0 comments on commit 2df12f9

Please sign in to comment.