AUTHORS
6.08 KB
-
Merge branch 'release' · 0ed3a95d
Conflicts: AUTHORS common/static/js/vendor/ova/OpenSeaDragonAnnotation.js common/test/acceptance/pages/lms/dashboard.py
Andy Armstrong committed
Conflicts: AUTHORS common/static/js/vendor/ova/OpenSeaDragonAnnotation.js common/test/acceptance/pages/lms/dashboard.py