projects / gruntmaster-page.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2d7874 42243f0)
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 patch | diff1 | diff2 | blob | history

diff --cc lib/Plack/App/Gruntmaster/HTML.pm
Simple merge
Gruntmaster page generators
This page took 0.010633 seconds and 4 git commands to generate.