jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,921 Commits 98 Branches 0 Tags 0 B
Commit Graph

2 Commits

Author SHA1 Message Date
alan eb1c6ccf85 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 11:36:49 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00