summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-08-12 17:11:01 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-08-12 17:11:01 -0300
commit39334868d40f56cac70ebd183e25a79504163fd1 (patch)
tree31e160a93b9d51ba0d99fbd9b13ec73438fc4fc6 /.gitattributes
parentc52981ceb04b5905f2003d6112811468b6434243 (diff)
parent948d1832785516f58598174197e542d8f489fa95 (diff)
Merge remote-tracking branch 'chiiph/bug/handle_reconnecting' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions