summaryrefslogtreecommitdiff
path: root/app/views/main
AgeCommit message (Collapse)Author
2014-04-23Merge branch 'clean2'Luke Shumaker
Conflicts: app/assets/stylesheets/static.css.scss app/controllers/static_controller.rb