Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sat, 14 Feb 2015 16:29:46 +0000 (18:29 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sat, 14 Feb 2015 16:29:46 +0000 (18:29 +0200)
commitd4ca2412db2c1c6e021809e9b72d3410abc476c2
tree627e2205060bb8adb38e4e3cce88f9df5e54a267
parent00c887ce06707532ce45ad863139f79455480d24
parente6d1bcd4c0c019a9b0c120370e801d5247221c36
Merge branch 'master' into newmc

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