Daniel Pan b567379c2c Merge branch '5.1' ... Conflicts: seahub/templates/registration/password_change_form.html seahub/templates/sysadmin/base.html seahub/templates/sysadmin/sysadmin_backbone.html		2016-06-13 18:25:20 +08:00
..
collections	[group discussion] added 'load more'	2016-03-25 17:54:53 +08:00
models	Added remote wipe option when unlinking a device.	2016-05-27 13:57:25 +08:00
views	Merge branch '5.1'	2016-06-13 18:25:20 +08:00
main.js	[backbone] Merge into one library app	2015-04-22 15:31:49 +08:00
router.js	Add nav footer	2016-05-13 20:11:20 +08:00