mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
nextcloud/apps/media
History
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 		2012-07-25 17:08:18 -04:00
..
ajax remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
appinfo fix remote and public.php 2012-07-13 22:44:35 +02:00
css adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
js Make file actions permissions aware 2012-07-25 16:33:08 -04:00
l10n update translations 2012-06-06 00:29:28 +02:00
lib/share Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
server Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
templates removing executable bit - again 2012-05-15 00:52:00 +02:00
index.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
lib_ampache.php remove unused variables 2012-07-20 18:56:18 +02:00
lib_collection.php remove unused variables 2012-07-20 18:56:18 +02:00
lib_media.php remove unused variables 2012-07-20 18:56:18 +02:00
lib_scanner.php Don't call getLocalFile() until you know it actually is music 2012-06-26 14:51:31 -04:00
remote.php Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
settings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00