Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Mon, 8 Apr 2013 21:34:37 +0000 (22:34 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 8 Apr 2013 21:34:37 +0000 (22:34 +0100)
Conflicts:
Gemfile.lock
app/views/diary_entry/list.html.erb

1  2 
Gemfile.lock
app/controllers/application_controller.rb

diff --cc Gemfile.lock
Simple merge