zhengxie f364946310 Merge branch '6.1' ...

Conflicts:
	seahub/api2/endpoints/admin/two_factor_auth.py
	seahub/profile/views.py
	seahub/views/sysadmin.py

2017-09-12 14:14:15 +08:00

..

api

Add ENABLE_ADDRESSBOOK_OPT_IN setting

2017-09-11 11:13:59 +08:00

common

add amdin system library upload api

2017-07-03 14:42:12 +08:00

seahub

Merge branch '6.1'

2017-09-12 14:14:15 +08:00

ui

update admin manage group page

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

__init__.py

improved tests

2014-09-06 11:38:20 +08:00

install-deps.sh

[tests] Update phantomjs installation

2017-07-03 11:22:59 +08:00

seahubtests.sh

[tests] Fix error

2015-05-15 11:23:56 +08:00