Diana Huang a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/course_modes/views.py

2014-11-04 10:50:09 -05:00

..

_login-register.scss

i18n logistration

2014-10-30 14:09:15 -04:00

_shoppingcart.scss

css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’

2014-10-22 09:12:32 -04:00

_verification.scss

Clean up after track selection experiment

2014-10-14 13:56:49 -04:00