Andy Armstrong
0ed3a95d3a
Merge branch 'release'
Conflicts:
AUTHORS
common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
..
2014-09-24 20:05:42 +03:00
2014-09-22 13:15:40 +05:00
2013-11-20 20:39:40 -08:00
2014-09-25 16:25:45 -04:00
2012-06-06 14:09:01 -04:00
2014-09-24 21:20:49 +00:00
2014-02-10 14:07:50 -05:00
2014-09-23 12:31:46 -04:00
2014-06-23 16:50:28 -04:00
2013-12-03 15:34:55 -05:00
2014-09-18 11:35:17 -04:00
2014-09-10 15:35:28 -04:00
2014-09-23 18:45:59 -04:00
2014-09-18 17:59:12 -04:00
2012-07-23 14:44:40 -04:00
2014-09-22 12:50:46 +05:00