diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-24 15:26:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-24 15:26:47 -0300 |
| commit | c01e87456bc5fded14778251bbd5dfe4fc4ebbd0 (patch) | |
| tree | 38e48db1889e1af3b7b60cdb43ab7786798d557a /.gitattributes | |
| parent | faadf8dc3bb1e49adc23c64d5a851b7eea0ce2ee (diff) | |
| parent | ce88b52295881a3dd1bc0efec8e72b1d3a235e87 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/add-frontend-alive-check' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions