Merge remote branch 'public2/master' into hw2_start
[slick.rotten.hw2.git] / app / helpers / 
treec3acafce309d01faad17161191f3845ce446dc60
drwxr-xr-x   ..
-rw-r--r-- 29 application_helper.rb
-rw-r--r-- 116 movies_helper.rb