zhengxie 57cc2b4aba Merge branch '5.1' ... Conflicts: seahub/base/accounts.py seahub/share/views.py seahub/views/sysadmin.py tests/seahub/base/test_accounts.py tests/seahub/share/views/test_ajax_get_download_link.py tests/seahub/share/views/test_ajax_get_upload_link.py		2016-07-21 10:55:50 +08:00
..
collections	[invitations] bugfix & improvment	2016-07-20 15:45:05 +08:00
models	new invitation page	2016-07-20 15:40:58 +08:00
views	Merge branch '5.1'	2016-07-21 10:55:50 +08:00
main.js	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
router.js	new invitation page	2016-07-20 15:40:58 +08:00