git.shadowcat.co.uk Git - catagits/Catalyst-Runtime.git/commit - Changes

projects / catagits/Catalyst-Runtime.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c017b11 e4f3fb2)

author	John Napiorkowski <jjn1056@yahoo.com>
	Wed, 31 Dec 2014 16:36:02 +0000 (10:36 -0600)
committer	John Napiorkowski <jjn1056@yahoo.com>
	Wed, 31 Dec 2014 16:36:02 +0000 (10:36 -0600)
commit	6dcc530761473f574ccde956e3a321b1dfb3d27e
tree	c0fd0556f02cb64b5ddcf608e371ce518131ff00	tree \| snapshot
parent	c017b11bf96db335cf4efce1808d56d13651b10a	commit \| diff
parent	e4f3fb2485c9181600ca8fe759016f9e69a53f2d	commit \| diff

merged and resolved conflicts from stable

Changes	diff1 \|	diff2 \|	blob \| history
lib/Catalyst.pm	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Middleware/Stash.pm	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Request.pm	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Runtime.pm	diff1 \|	diff2 \|	blob \| history

The Perl MVC Framework (catagits@git.shadowcat.co.uk:Catalyst-Runtime.git)