summaryrefslogtreecommitdiff
path: root/config.ru
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-04 21:07:32 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-04 21:07:32 -0400
commit1cca0b2c418d1c4a31a27c98d7b0951545303d2c (patch)
tree889ae82c823c87c33438c9b3f40c67a5036698de /config.ru
parent1627387966a4186a924bafd80cbd84c0861142b5 (diff)
parentb43bab15521c7c511ab7012bd137daa0e85bb95b (diff)
Merge branch 'clean2'
Conflicts: config/routes.rb db/schema.rb
Diffstat (limited to 'config.ru')
0 files changed, 0 insertions, 0 deletions