summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-11-25 12:39:33 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-11-25 12:39:33 -0300
commit194f4d896e2ada660fe082c7f486279723fdb1b0 (patch)
tree6e4a46f56e499e79568843ae302528f5c9ac5d66 /client
parentd2f161e3efda601bccfc390392302f665f8a644b (diff)
parent61fe6b1ed3f8a42eb22e12168c88212e55b9095e (diff)
Merge remote-tracking branch 'drebs/bug/4258_remove-dependency-on-nose2' into develop
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions