Daniel Pan b567379c2c Merge branch '5.1' ...

Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html

2016-06-13 18:25:20 +08:00

..

api

Merge branch '5.1'

2016-06-13 18:25:20 +08:00

common

…

seahub

Merge branch '5.1'

2016-06-13 18:25:20 +08:00

ui

…

__init__.py

…

install-deps.sh

travis ci: download phantomjs from bintray instead of bitbucket.

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

seahubtests.sh

…