Commit Graph

4 Commits

Author SHA1 Message Date
杨树明775174143 ffd2f988c1 Merge branch 'develop' of http://git.trustie.net/wrm1995/codepedia2 into develop
# Conflicts:
#	apps/operations/views.py
#	static/css/code_show.css
#	templates/projects/filesub/annotation.html
#	templates/projects/filesub/code-reading.html
2018-08-07 19:51:40 +08:00
wrmswindmill 3e9b53aea6 shuming modify a lot, fix register by custom auther 2018-07-31 10:46:48 +08:00
wrmswindmill 99d6f6aff3 2018-7-15 2018-07-15 10:09:43 +08:00
YouXinyu 984d1e957f add newproject 2018-07-09 15:14:57 +08:00