Gregwar 516046a6b5 Merge remote-tracking branch 'jeremy/logicsplit' ... Conflicts: Generator/CaptchaGenerator.php Resources/config/services.yml		2012-12-04 11:42:35 +01:00
..
config	Merge remote-tracking branch 'jeremy/logicsplit'	2012-12-04 11:42:35 +01:00
views	[view] Adding empty "alt" to ass HTML5 validator (fixes #37)	2012-12-02 13:12:12 +01:00