diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-04-14 16:28:25 +0200 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-04-14 16:28:25 +0200 |
| commit | 31d2d0c158ad4daa3dde7a905f3c2e312c194f2e (patch) | |
| tree | 43d761d2aec8265a22c0fdedcc365bacc10dc814 /server/vendor/justinrainbow/json-schema/.gitattributes | |
| parent | 27730911d8c9253a4f5aa90450c57cdeca9d5d26 (diff) | |
| parent | b348dbc2266a3e8070a3951fb0bd8c19b852ec47 (diff) | |
Merge branch 'compute'
Conflicts:
server/core/LibOverride/genTokenOptions.php
Diffstat (limited to 'server/vendor/justinrainbow/json-schema/.gitattributes')
| -rwxr-xr-x | server/vendor/justinrainbow/json-schema/.gitattributes | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/server/vendor/justinrainbow/json-schema/.gitattributes b/server/vendor/justinrainbow/json-schema/.gitattributes deleted file mode 100755 index beeff5b..0000000 --- a/server/vendor/justinrainbow/json-schema/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -/docs export-ignore -/tests export-ignore -.gitignore export-ignore -.travis.yml export-ignore -phpunit.dist.xml export-ignore |