summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-17 17:52:22 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-17 17:52:22 -0300
commit175fcd7e82035dd4806ffb9b55364d000c44caaf (patch)
tree6932fbbdfb16373eca01228fba025b0ba9e8524d /.gitattributes
parent4ada92f8b062d77925e5f57c65e9d8ae1878934d (diff)
parentc4f07e6237ee4b4c0cd2180f00d9d681416fe63c (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-failing-tests' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions