]> iEval git - plack-app-gruntmaster.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 18:04:07 +0000 (20:04 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 18:04:07 +0000 (20:04 +0200)
Conflicts:
lib/Plack/App/Gruntmaster.pm

1  2 
lib/Plack/App/Gruntmaster/HTML.pm

Simple merge
This page took 0.024126 seconds and 4 git commands to generate.