Merge remote-tracking branch 'origin/master' into feature/bridger/cleanup
Conflicts: lms/templates/static_templates/jobs.html
Showing
common/lib/capa/capa/chem/chemtools.py
0 → 100644
common/lib/capa/capa/customrender.py
0 → 100644
This diff is collapsed.
Click to expand it.
common/lib/capa/capa/registry.py
0 → 100644
This diff is collapsed.
Click to expand it.
32 KB
60.4 KB
78.9 KB
77.3 KB
63.8 KB
62.1 KB
65.9 KB
51.4 KB
74.4 KB
85.4 KB
70.8 KB
79.8 KB
57.5 KB
63.8 KB
56.2 KB
71.1 KB
69.2 KB
60.6 KB
43.8 KB
61.8 KB
60.8 KB
134 KB
60 KB
70.9 KB
69.8 KB
61.8 KB
65.3 KB
86.9 KB
69.7 KB
55.7 KB
52.4 KB
92.5 KB
54.8 KB
46.6 KB
116 KB
87.4 KB
... | ... | @@ -50,3 +50,4 @@ pystache==0.3.1 |
python-openid==2.2.5 | ||
South==0.7.5 | ||
Unidecode==0.04.9 | ||
dogstatsd-python==0.2.1 |
... | ... | @@ -50,3 +50,5 @@ pygraphviz |
-r repo-requirements.txt | ||
pil | ||
nltk | ||
dogstatsd-python | ||
MySQL-python |