zhengxie d82df5fb52 Merge branch '6.0' ...

Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py

2017-02-17 17:11:33 +08:00

..

collection

update admin manage group page

2017-02-09 14:59:49 +08:00

models

Merge branch '6.0'

2017-02-17 17:11:33 +08:00

views

Merge branch '6.0'

2017-02-17 17:11:33 +08:00

main.js

Reimplement sysadmin with backbone

2016-04-23 17:13:32 +08:00

router.js

update admin manage group page

2017-02-09 14:59:49 +08:00