Merge branch 'rails41'
authorTom Hughes <tom@compton.nu>
Mon, 21 Jul 2014 07:53:44 +0000 (08:53 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 21 Jul 2014 07:53:44 +0000 (08:53 +0100)
1  2 
app/helpers/browse_helper.rb
test/helpers/browse_helper_test.rb

Simple merge
Simple merge