diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-26 20:44:02 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-26 20:44:02 +0200 |
| commit | e5e6f447ba17ba51957a1228e55fe53d8087776a (patch) | |
| tree | f59213d66fcb910725f8fd34def06e89d88e5241 /.gitattributes | |
| parent | b66e5840006078112b8da741b2c612e446afd452 (diff) | |
| parent | 8f2758f6b53b11db38d83ea9ad838ed802a6e635 (diff) | |
| download | rpg-e5e6f447ba17ba51957a1228e55fe53d8087776a.tar.gz rpg-e5e6f447ba17ba51957a1228e55fe53d8087776a.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts:
inc/lang/cs/lang.php
inc/lang/hu/lang.php
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 0fefdf647..1012087d4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,11 @@ *.gif binary *.ico binary *.xcf binary + +.gitattributes export-ignore +.gitignore export-ignore +.editorconfig export-ignore +.travis.yml export-ignore +_test export-ignore +_cs export-ignore +lib/plugins/testing export-ignore |