]> iEval git - gruntmaster-page.git/commitdiff
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
tmpl/pb_entry.en

diff --cc app.psgi
Simple merge
Simple merge
This page took 0.025663 seconds and 4 git commands to generate.