virusdefender c295d5d032 Merge branch 'dev-s' into virusdefender-dev ... * dev-s: 小调整，修改addContest的小bug， 修复小bug，仿照problem GET添加获取单个比赛信息的API 添加后台编辑比赛页面[CI SKIP] Conflicts: static/src/js/app/admin/contest/contestList.js static/src/js/app/admin/contest/editContest.js		2015-10-30 15:16:24 +08:00
..
src	Merge branch 'dev-s' into virusdefender-dev	2015-10-30 15:16:24 +08:00