Merge "Make it possible to include files in templates"
authorMichal Skalski <mskalski@mirantis.com>
Tue, 2 Aug 2016 09:19:44 +0000 (09:19 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 2 Aug 2016 09:19:44 +0000 (09:19 +0000)

Trivial merge