diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-07-10 16:04:59 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-07-10 16:04:59 -0300 |
| commit | 00db8a715be4ab7048a2f4ea2e6cfe80ec6c444a (patch) | |
| tree | 972957ea7ffd52b21055c37bbe11d4ff25bdf86e /.gitignore | |
| parent | a2fa8ab8b0135529234420555d3ab8890dad8d06 (diff) | |
| parent | 293c71080e9a21115d248e46d1a706c53cc8ee37 (diff) | |
Merge branch 'master' into develop
master and develop "diverged" because a merge commit, this moves us
back to good track.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions