diff options
| author | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
| commit | 53a57d16b9c741bb44099fd93bf79efa06796341 (patch) | |
| tree | 24a90a50afe9325926c8ebaa2ed90f9fa093e5b9 /.gitattributes | |
| parent | cf6e6645c31a9f185cef3fb9452fb188882ede47 (diff) | |
| parent | a060d9973e7c1d5051f2cc426937881826e4972e (diff) | |
| download | rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.gz rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.bz2 | |
Merge branch master into stable
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 1012087d4..6beb1fb7a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,8 @@ .gitignore export-ignore .editorconfig export-ignore .travis.yml export-ignore +composer.json export-ignore +composer.lock export-ignore _test export-ignore _cs export-ignore lib/plugins/testing export-ignore |