haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
This commit is contained in:
zhengxie
2017-04-17 16:21:22 +08:00
parent 088bf8f6c5 3d662c3fdb
commit e6e6e82b82
56 changed files with 821 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/scripts/app/views/starred-file.js
View File

@@ -94,7 +94,6 @@ define([
render: function() {
this.$el.html(this.template());
$("#right-panel").html(this.$el);
this.$table = this.$('table');
this.$tableBody = this.$('tbody');