Scott Erickson 05bd12e8cc Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation ... # Conflicts: # app/views/account/SubscriptionView.coffee		2015-11-04 10:47:39 -08:00
..
account-prepaid-view.sass	Refactor PrepaidView to use new event callback naming guideline	2015-10-21 14:16:44 -07:00
account-settings-view.sass
invoices-view.sass
main-account-view.sass
profile-view.sass
subscription-sale-view.sass	Extend terminal sub with year sub purchase	2015-08-27 09:45:10 -07:00
subscription-view.sass	1. email validation when subscribing other users	2015-10-08 21:59:12 -07:00
unsubscribe-view.sass