diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-25 12:39:33 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-25 12:39:33 -0300 |
commit | 194f4d896e2ada660fe082c7f486279723fdb1b0 (patch) | |
tree | 6e4a46f56e499e79568843ae302528f5c9ac5d66 /server/.gitattributes | |
parent | d2f161e3efda601bccfc390392302f665f8a644b (diff) | |
parent | 61fe6b1ed3f8a42eb22e12168c88212e55b9095e (diff) |
Merge remote-tracking branch 'drebs/bug/4258_remove-dependency-on-nose2' into develop
Diffstat (limited to 'server/.gitattributes')
0 files changed, 0 insertions, 0 deletions