Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sat, 21 Mar 2015 17:16:35 +0000 (19:16 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sat, 21 Mar 2015 17:16:35 +0000 (19:16 +0200)
commit5d3c8a5435a93f9f1d1fbb1c78d32790e7f641d4
treea3fbc387e59c5530cff7a37f8950386ed5133a30
parent9694ccf33654e0cc01a2fa9390b76eb1a276d304
parentf4154608b9a883bb70391c6dd6eea32f0051f6ea
Merge branch 'master' into newmc

Conflicts:
tmpl/skel.en
lib/Plack/App/Gruntmaster/HTML.pm
tmpl/pb_entry.en
tmpl/skel.en
This page took 0.010909 seconds and 4 git commands to generate.