projects / gruntmaster-page.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 555ec5d 0a32929)
Merge branch 'master' into mindcoding
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 25 Mar 2014 12:38:32 +0000 (14:38 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 25 Mar 2014 12:38:32 +0000 (14:38 +0200)
Conflicts:
lib/Gruntmaster/Page/Generic.pm
lib/Gruntmaster/Page/Pb/Entry.pm
tmpl/ct_entry.en

1  2 
app.psgi patch | diff1 | diff2 | blob | history
tmpl/pb_entry.en patch | diff1 | diff2 | blob | history

diff --cc app.psgi
Simple merge
diff --cc tmpl/pb_entry.en
Simple merge
Gruntmaster page generators
This page took 0.010813 seconds and 4 git commands to generate.