welcome_on_signup.html
15.6 KB
-
Merge branch 'invite' · 234d1291
Conflicts: public/css/less/gfbox.less public/emails/reset_password.html public/emails/welcome_on_signup.html
Torkel Ödegaard committed
Conflicts: public/css/less/gfbox.less public/emails/reset_password.html public/emails/welcome_on_signup.html