zhengxie 8d10466ce9 Merge branch '6.2' ...

Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py

2018-04-27 11:00:43 +08:00

..

collections

[dir view] added 'file comment'

2017-09-26 10:35:16 +08:00

models

multi storage backend

2017-12-19 15:41:36 +08:00

views

Merge branch '6.2'

2018-04-27 11:00:43 +08:00

main.js

[backbone] Merge into one library app

2015-04-22 15:31:49 +08:00

router.js

Merge branch '6.2'

2018-04-27 11:00:43 +08:00