hohoTT 17a0448890 Merge branch 'dev' into hohoTT-dev ...

Conflicts:
	oj/urls.py

2015-09-17 20:33:16 +08:00

..

change_password.html

Merge branch 'dev' into hohoTT-dev

2015-09-17 20:33:16 +08:00

login.html

Merge branch 'dev' into hohoTT-dev

2015-09-17 20:33:16 +08:00

register.html

Merge branch 'dev' into hohoTT-dev

2015-09-17 20:33:16 +08:00

reset_password.html

修改源码模板路径

2015-08-25 16:18:24 +08:00