diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
| commit | 4b8290f563ad5ac84dd92fb8ca97ba5970c472b3 (patch) | |
| tree | 7dca7c98013775628c2b4d1596e0be41d8d4bda2 /.gitattributes | |
| parent | 9a734b7aaba1445e06c1ccb95e59f54e01688d45 (diff) | |
| parent | 4286c64e98499b93056c09498c10709f8909befd (diff) | |
| download | rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.gz rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.bz2 | |
Merge branch 'master' into ioreplaceinfile
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 |