Eric Davis ee9b129382 Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0 ... Conflicts: test/unit/journal_test.rb		2011-06-10 11:41:52 -07:00
..
redmine/acts/journalized	Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0	2011-06-10 11:41:52 -07:00
acts_as_journalized.rb	[#400] Fix the event types (icons on activity and search views).	2011-05-20 13:51:51 -07:00
journal_deprecated.rb	[#123] Added latest edavis10:acts_as_journalized	2011-05-13 09:55:55 -07:00
journal_formatter.rb	[#123] Added latest edavis10:acts_as_journalized	2011-05-13 09:55:55 -07:00