diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-16 16:42:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-16 16:42:03 -0300 |
| commit | 34457adc72a4a4c0b4bff4791f4329bca66162c1 (patch) | |
| tree | 279542ab3ce460d1f0bcd7943352c3e792c9f2c6 /.gitattributes | |
| parent | 4f946ea2189e78da0488a28b3bb8a8aed997a1c5 (diff) | |
| parent | 3d6629348aedf2a6863d242d96d64b3492e86f9a (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/new-frontend-backend' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions