fix merge

This commit is contained in:
Kyle Drake 2014-04-17 14:16:40 -07:00
commit 2b004fca1a
13 changed files with 283 additions and 19 deletions

2
app.rb
View file

@ -133,7 +133,7 @@ end
get '/dashboard' do
require_login
slim :'dashboard'
erb :'dashboard'
end
get '/signin' do