catch branch up with master

This commit is contained in:
Kyle Drake 2015-07-13 20:14:55 -07:00
commit af0a31d6a2
102 changed files with 4055 additions and 919 deletions

3
app.rb
View file

@ -36,6 +36,7 @@ before do
end
not_found do
@title = 'Not Found'
erb :'not_found'
end
@ -44,7 +45,7 @@ error do
from: 'web@neocities.org',
to: 'errors@neocities.org',
subject: "[Neocities Error] #{env['sinatra.error'].class}: #{env['sinatra.error'].message}",
body: erb(:'views/templates/email/error'),
body: erb(:'templates/email/error', layout: false),
no_footer: true
})