haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-15 23:00:57 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
This commit is contained in:
Daniel Pan
2016-05-21 13:42:04 +08:00
parent e8a60d3318 ce2648e646
commit ee99d7aad8
123 changed files with 26940 additions and 21385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/scripts/app/views/group-discussions.js
View File

@@ -128,7 +128,6 @@ define([
}
});
this.$(".msg-input").focus();
app.router.navigate('group/' + this.groupView.group.id + '/discussions/');
},