Merge branch 'dev' into hohoTT-dev

2015-08-21 18:19:01 +08:00
parent 53d2b674c9 e572190a66
commit 9c43fe92ff
22 changed files with 4271 additions and 151 deletions
--- a/template/oj/problem/problem_list.html
+++ b/template/oj/problem/problem_list.html
@@ -1,7 +1,7 @@
 {% extends "oj_base.html" %}
 {% block body %}
    {% load problem %}
-    <div class="container main" ms-controller="problem_list">
+    <div class="container main">
        <div class="row">
            <div class="col-lg-9">
                <div class="row">