David Ormsbee 98ff3d5bfb Merge branch 'master' into move_settings ...

Conflicts:
	djangoapps/student/views.py
	urls.py

2012-04-02 14:26:05 -04:00

..

management

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

migrations

Name and e-mail change functionality appears to work -- needs graphic design

2012-03-21 09:39:32 -04:00

__init__.py

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

models.py

Better logging. Tested and fixed bugs in previous commits

2012-03-28 17:45:43 -04:00

tests.py

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

views.py

Merge branch 'master' into move_settings

2012-04-02 14:26:05 -04:00