database.yml change
Merge branch 'master' of github.com:pramodshinde/joshforum
Merge branch 'master' of github.com:pramodshinde/joshforum
user change
user change