zhengxie 1b11350f80 Merge branch '6.0' ... Conflicts: seahub/templates/sysadmin/sysadmin_backbone.html seahub/urls.py seahub/views/sysadmin.py static/scripts/app/views/dir.js		2017-03-27 13:53:35 +08:00
..
collections	Merge pull request #1361 from haiwen/fileupload	2016-11-18 11:29:52 +08:00
models	new invitation page	2016-07-20 15:40:58 +08:00
views	Merge branch '6.0'	2017-03-27 13:53:35 +08:00
main.js	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
router.js	[mobile] redesigned big modal popups	2017-01-04 17:19:57 +08:00