Michael Gapczynski ea23854328 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php		2012-08-06 13:49:54 -04:00
..
admin.js	move files to app folder	2012-04-18 17:27:34 +02:00
fileactions.js	Merge branch 'master' into share_api	2012-07-31 15:00:04 -04:00
filelist.js	Add notifications and undo support for replacing files when renaming	2012-07-30 12:22:11 -04:00
files.js	Merge branch 'master' into share_api	2012-08-06 13:49:54 -04:00
jquery.fileupload.js	move files to the correct place	2012-04-26 21:24:41 +02:00
jquery.iframe-transport.js	move files to the correct place	2012-04-26 21:24:41 +02:00
timezone.js	fix path in /apps/files/js/timezone.php	2012-04-23 16:17:35 +02:00