develop #6

Closed

pofyban6j wants to merge 30 commits from develop into gjw_branch

Author	SHA1	Message	Date
LiuR	1ab32f6792	Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop	5 months ago
LiuR	ad10b1899e	merge it	5 months ago
cheese-egg-yolk	8504741f5b	Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop	5 months ago
cheese-egg-yolk	3169b238cb	Merge branch 'hjn_branch' into develop	5 months ago
cheese-egg-yolk	0819044632	滚	5 months ago
xm	f4d1fc2a90	添加.gitignore，忽略IDE配置文件	5 months ago
xm	4903c5dc91	修复嵌套仓库问题，添加DjangoBlog项目文件	5 months ago
xm	e8f91c1633	解决合并冲突：处理doc/报告.docx文件	5 months ago
xm	53c15adc39	解决合并冲突：决定保留/删除 doc/报告.docx	5 months ago
cheese-egg-yolk	3d2f28dc80	Merge branch 'hjn_branch' into develop	5 months ago
plqo32bax	d78f18e2c8	Update context_processors.py	5 months ago
cheese-egg-yolk	0c459e1ea7	Merge branch 'hjn_branch' of https://bdgit.educoder.net/p3mk6vbs7/Django into hjn_branch	5 months ago
cheese-egg-yolk	01d2fe0a52	提交信息，描述本次代码变更内容	5 months ago
LiuR	3ac7d80342	change	5 months ago
顾婧玟	772740ccd2	Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop	5 months ago
顾婧玟	974028882d	解决合并冲突，完成 gjw_branch 到 develop 的合并	5 months ago
xm	78bf2ede9c	Merge branch 'xm_branch' into develop	5 months ago
xm	9a39ad406c	解决合并冲突	5 months ago
p3mk6vbs7	8581d5796c	Update manage.py	5 months ago
plqo32bax	329670346f	ADD file via upload	5 months ago
xm	6fda0dbde7	Merge branch 'xm_branch' into develop	5 months ago
xm	991376a40e	更新项目IDE配置文件	5 months ago
p3mk6vbs7	3a17741ef0	Update DjangoBlog-master.iml	5 months ago
p32cia7zh	c1c8aea746	ADD file via upload	5 months ago
plqo32bax	c7bf8f69dd	ADD file via upload	5 months ago
p3mk6vbs7	20a712f420	ADD file via upload	5 months ago
p3mk6vbs7	47214b18fd	ADD file via upload	5 months ago
cheese-egg-yolk	46fbfc6305	完成用户登录功能的开发	5 months ago
LiuR	be4e2bd82c	again	5 months ago
LiuR	fd633aaac9	try it	5 months ago

develop #6

30 Commits (master)