Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/1.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ellypse committed Jul 8, 2019
2 parents 3b2b567 + 982bda4 commit 35cdee3
Show file tree
Hide file tree
Showing 227 changed files with 54,093 additions and 44,718 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Expand Up @@ -8,7 +8,7 @@ root = true
# - UTF-8 encoding
# - TABS!
[*]
end_of_line = crlf
end_of_line = unset
charset = utf-8
indent_style = tab

Expand All @@ -18,4 +18,4 @@ end_of_line = lf
# CurseForge's .pkgmeta file has to be indented with spaces
[.pkgmeta]
indent_style = space
indent_size = 2
indent_size = 2
Binary file added .gitattributes
Binary file not shown.
7 changes: 5 additions & 2 deletions .gitmodules
@@ -1,12 +1,15 @@
[submodule "totalRP3/libs/Ellyb"]
path = totalRP3/libs/Ellyb
url = https://github.com/Ellypse/Ellyb
[submodule "Documents/Scripts/mature-dict"]
path = Documents/Scripts/mature-dict
[submodule "Scripts/mature-dict"]
path = Scripts/mature-dict
url = https://github.com/Ellypse/List-of-Dirty-Naughty-Obscene-and-Otherwise-Bad-Words
[submodule "totalRP3/libs/LibMSP"]
path = totalRP3/libs/LibMSP
url = https://github.com/Ellypse/LibMSP
[submodule "totalRP3/libs/LibDeflate"]
path = totalRP3/libs/LibDeflate
url = https://github.com/SafeteeWoW/LibDeflate
[submodule "totalRP3/libs/LibRPMedia"]
path = totalRP3/libs/LibRPMedia
url = https://github.com/wow-rp-addons/LibRPMedia

0 comments on commit 35cdee3

Please sign in to comment.