zhengxie 00f64782ad Merge branch 'dir-share-popup' ... Conflicts: seahub/api2/views.py static/scripts/app/views/share.js static/scripts/common.js tests/api/test_shares.py		2015-07-15 15:06:56 +08:00
..
collections	[js] bugfix for object	2015-06-10 13:43:41 +08:00
models	[js] bugfix for object	2015-06-10 13:43:41 +08:00
views	Merge branch 'dir-share-popup'	2015-07-15 15:06:56 +08:00
main.js	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
router.js	[guest-user] update url of "libraries" and "my home" tab	2015-06-25 12:05:47 +08:00