Added port in database.yml
Added port in database.yml
added assets
Added url
Updated production
Updated production
Updated production
Updated production
Updated production
Conflicts fixed after university pull