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

..

api

Merge branch '6.0'

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

common

…

seahub

Merge pull request #1475 from haiwen/odf-view

2017-02-13 16:49:12 +08:00

ui

update admin manage group page

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

__init__.py

…

install-deps.sh

travis ci: download phantomjs from bintray instead of bitbucket.

2016-05-17 11:11:18 +08:00

seahubtests.sh

…