]> git.jsancho.org Git - gacela.git/commitdiff
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)

Trivial merge