tree 06e1e62d89950d331a52b1cea83f9839855147d1
parent ae2d34122822684d7166016a46868e1a3233834d
parent 087c0a4c9038ac2fa8858d740d70b70e46b71b90
author Aleš Komárek <mail@newt.cz> 1462364312 +0200
committer Aleš Komárek <mail@newt.cz> 1462364312 +0200

Merge branch 'feature/map-jinja-yaml' into 'master'

Feature/map jinja yaml

See merge request !4