]> iEval git - gruntmaster-page.git/commit - make_static.PL
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sat, 18 Apr 2015 09:12:03 +0000 (12:12 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Sat, 18 Apr 2015 09:12:03 +0000 (12:12 +0300)
commit65ef54654e9694d87b8b10e930201227bb625c2e
treeb7616ef3842cc7df81f6c81ad35c2adc93fada4c
parent040bdc724a842533132112d328cc4f396a3cf7d3
parent73442382a932be299bc503971887b541c4a1f056
Merge branch 'master' into newmc

Conflicts:
Makefile.PL
css/custom.css
js/90-mobilenav.js
js/90-nav.js
js/90-themes.js
make_static.PL
tmpl/skel.en
Makefile.PL
css/custom.css
js/90-mobilenav.js
js/90-move-sponsors.js
js/90-nav.js
js/90-themes.js
js/90-webchat-link.js
lib/Plack/App/Gruntmaster/HTML.pm
make_static.PL
tmpl/pb_entry.en
tmpl/skel.en
This page took 0.026683 seconds and 4 git commands to generate.