tasks.py
7.01 KB
-
Merge branch 'feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729 · d3a86a20
Conflicts: lms/static/sass/base/_variables.scss
Sef Kloninger committed
Conflicts: lms/static/sass/base/_variables.scss