Victor Shnayder cc8f0a1634 Fix merge bugs

2012-10-27 19:57:29 -04:00

..

djangoapps

Merge pull request #952 from MITx/vik/add_instrumentation

2012-10-24 12:23:31 -07:00

lib

Fix merge bugs

2012-10-27 19:57:29 -04:00

static

putting vsepr static image files where vsepr js can find them. TODO: reogranize after proper input type static file storage is sorted out.

2012-10-26 21:41:22 -04:00

templates

Added MathJax to wiki pages.

2012-08-18 13:12:04 -04:00

test

Removed accidental symlink.

2012-09-20 17:41:02 -04:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00