Jean-Philippe Lang 3d23c42fc0 Do not use .merge_conditions. ... git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7898 e93f8b46-1217-0410-a6f0-8f06a7374b81		2011-11-23 19:00:54 +00:00
..
controllers	Resourcified issue statuses.	2011-11-22 22:04:07 +00:00
helpers	fix inconsistent image filename extensions (#9638)	2011-11-23 05:30:53 +00:00
models	Do not use .merge_conditions.	2011-11-23 19:00:54 +00:00
views	Resourcified issue statuses.	2011-11-22 22:04:07 +00:00