iEval git - gruntmaster-page.git/commit

projects / gruntmaster-page.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bb41631 a221db1)

author	Marius Gavrilescu <marius@ieval.ro>
	Sun, 8 Feb 2015 10:56:33 +0000 (12:56 +0200)
committer	Marius Gavrilescu <marius@ieval.ro>
	Sun, 8 Feb 2015 10:56:33 +0000 (12:56 +0200)
commit	760348134595e67b49d9be7284ae9c74c1d2d9b5
tree	9aef3c024523080cfc2ab71468456b940fc20e71	tree \| snapshot (tar.gz zip)
parent	bb4163112cc0f65489594601f7743a6165892b97	commit \| diff
parent	a221db10cdbfda88bfab58aa45c820ab6d8f3fb6	commit \| diff

Merge branch 'master' into newmc

Conflicts:
tmpl/skel.en

js/90-themes.js	diff1 \|	diff2 \|	blob \| history
lib/Plack/App/Gruntmaster/HTML.pm	diff1 \|	diff2 \|	blob \| history
tmpl/ct_entry.en	diff1 \|	diff2 \|	blob \| history
tmpl/pb_entry.en	diff1 \|	diff2 \|	blob \| history
tmpl/skel.en	diff1 \|	diff2 \|	blob \| history

Gruntmaster page generators

This page took 0.011229 seconds and 4 git commands to generate.