server/apps/files/js
Bart Visscher b483f2aab8 Merge branch 'master' into routing
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
2012-08-30 21:49:28 +02:00
..
admin.js move files to app folder 2012-04-18 17:27:34 +02:00
fileactions.js Merge remote-tracking branch 'gitorious/master' into routing 2012-08-29 20:16:39 +02:00
filelist.js Merge remote-tracking branch 'gitorious/master' into routing 2012-08-29 20:16:39 +02:00
files.js Whitespace fixes in apps 2012-08-29 20:29:43 +02: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