Commit 7855f6c3 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '189-templates-conflicts-free' into 'master' 

bring templates back from the dead

Closes #181, #131, #55, and #189

See merge request inject/frontend!167
parents ccb2837d e9674a00
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment