diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-01-17 15:52:21 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-01-17 15:52:21 -0300 |
commit | b17dee1c1ef4f423de4ff56c90e9c6d6b39e2504 (patch) | |
tree | 9c9c97be243360f29347ee9013604de21c5b8e85 /.gitattributes | |
parent | 646dd2fd5fb3980f08490dcba03948164ab62bdf (diff) | |
parent | 3117dd17ebbce9dcf31ecb2951ba58ed67bcf7ce (diff) |
Merge remote-tracking branch 'refs/remotes/ivan/feature/support-str-in-charset-detection' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions