Eric Davis 30e81bed5c Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string' ... Conflicts: app/views/wiki/annotate.rhtml app/views/wiki/diff.rhtml app/views/wiki/show.rhtml		2011-08-05 08:27:49 -07:00
..
controllers	move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices	2011-07-29 17:23:13 +02:00
helpers	[#547] Security audit	2011-08-01 16:00:23 -07:00
models	Touch journaled objects on journal creation only. #543	2011-07-29 15:12:06 +02:00
views	Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string'	2011-08-05 08:27:49 -07:00