Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 24 Feb 2015 19:51:29 +0000 (21:51 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 24 Feb 2015 19:51:29 +0000 (21:51 +0200)
commitb7c79e04cb3c8ea826ea1aac8049333564794536
tree51d33e9c6ab10f587925b6836e7572671564e4b3
parent9b61d5e9aff899014d7aca0feb9bab07cbcb8aef
parent1ca1e044db4c9ff84b8904ef2c89766c6f076a69
Merge branch 'master' into newmc

Conflicts:
app.psgi
app.psgi
lib/Plack/App/Gruntmaster.pm
This page took 0.010228 seconds and 4 git commands to generate.