Merge branch 'master' into dev
styles on new titles fixed, merge conflicts on comments fixed
styles on new titles fixed, merge conflicts on comments fixed
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com into dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' of https://github.com/devcongress/devcongress.com
Merge branch 'master' into dev
Registration email notification
Merge branch 'attendees/email_notification_on_signup'
SMPT (using Mailchimp's Mandrill) settings
SMPT (using Mailchimp's Mandrill) settings
Merge branch 'master' of heroku.com:peaceful-woodland-7453
'Successfully Registered' email template