]> git.jsancho.org Git - gacela.git/commit
Merge branch 'feature/composition' into develop
authorJavier Sancho <jsf@jsancho.org>
Mon, 24 Apr 2017 18:14:11 +0000 (20:14 +0200)
committerJavier Sancho <jsf@jsancho.org>
Mon, 24 Apr 2017 18:14:11 +0000 (20:14 +0200)
commit00a6aa06bc7d618a3a4c158096efaee9c43d4cd6
treec3aba8b4308d3142b7c6419eedc1073162d1c0a5
parent4300a23450f99d1ddf2b30abec1a529409c076fd
parenta6e989f0208d704ad6d0e7751ebb6d9ff776e797
Merge branch 'feature/composition' into develop