albert 944504ae69 fix conflicts

2013-02-23 18:29:37 -05:00

..

javascripts

fix conflicts

2013-02-23 18:29:37 -05:00

stylesheets

use sendmail mailer in production

2013-02-23 18:17:42 -05:00