diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-02-06 14:47:08 +0100 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-02-06 14:47:08 +0100 |
commit | 355bbdf8389d141f86ea37995f03f9aae37e6c41 (patch) | |
tree | ce4f6799549158dc268387297113c18b39bb28a7 /.gitattributes | |
parent | 6d3902b084275fd0aea2264eadbd6a21f6602b12 (diff) | |
parent | eb8eff7fc378c9e958848e21c1c39cb64f52126b (diff) | |
download | dotty-355bbdf8389d141f86ea37995f03f9aae37e6c41.tar.gz dotty-355bbdf8389d141f86ea37995f03f9aae37e6c41.tar.bz2 dotty-355bbdf8389d141f86ea37995f03f9aae37e6c41.zip |
Merge branch 'master' of github.com:lampepfl/dotty into paths
Conflicts:
readme.md
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions