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

..

controllers

[#436] Remove trailing whitespace

2011-05-30 20:52:25 +02:00

helpers

[#436] Remove trailing whitespace

2011-05-30 20:52:25 +02:00

models

[#441] Journals should touch their journaled to update updated_on/at fields

2011-06-05 11:49:40 -07:00

views

[#442] Handle nil changes in Atom feed

2011-06-10 11:21:07 -07:00