hohoTT b37b0d34c6 Merge branch 'dev' into hohoTT-dev ...

Conflicts:
	oj/settings.py
	oj/urls.py
	problem/views.py

2015-08-10 15:20:17 +08:00

..

__init__.py

重命名工程 qduoj -> oj

2015-08-02 08:59:01 +08:00

daocloud_settings.py

测试 docker 运行

2015-08-02 10:49:31 +08:00

local_settings.py

重命名工程 qduoj -> oj

2015-08-02 08:59:01 +08:00

server_settings.py

重命名工程 qduoj -> oj

2015-08-02 08:59:01 +08:00

settings.py

Merge branch 'dev' into hohoTT-dev

2015-08-10 15:20:17 +08:00

urls.py

Merge branch 'dev' into hohoTT-dev

2015-08-10 15:20:17 +08:00

wsgi.py

重命名工程 qduoj -> oj

2015-08-02 08:59:01 +08:00