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
..
app	Merge branch '5.1'	2016-07-21 10:55:50 +08:00
i18n
lib	rm unused files	2016-07-11 17:03:58 +08:00
sysadmin-app	[misc] fix	2016-07-20 14:20:19 +08:00
build.js	new admin devices page;	2016-04-23 18:07:09 +08:00
common.js	Merge branch '5.1'	2016-07-21 10:55:50 +08:00
file-tree.js	[lib setting] folder perm: open the jstree	2016-03-10 15:11:21 +08:00
main.js
pinyin-by-unicode.js
sysadmin-main.js	Reimplement sysadmin with backbone	2016-04-23 17:13:32 +08:00