Merge pull request #4106 from tomhughes/diary-paging

Replace page numbers with ID based selection for diary indexes

diff --cc app/controllers/diary_entries_controller.rb
Simple merge

diff --cc test/controllers/diary_entries_controller_test.rb
Simple merge