nextcloud/apps/files
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
..
ajax don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something 2012-06-01 11:12:50 +02:00
appinfo Remove OC_App::register function 2012-05-31 13:01:30 +02:00
css Make sure sharing and versions dropdowns come down in the same location for all files 2012-05-19 11:24:23 -04:00
js Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
l10n update translations 2012-05-17 00:36:21 +02:00
templates Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
admin.php removing executable bit - again 2012-05-15 00:52:00 +02:00
download.php removing executable bit - again 2012-05-15 00:52:00 +02:00
index.php fix the breadcrumb 2012-05-31 21:44:05 +02:00
settings.php removing executable bit - again 2012-05-15 00:52:00 +02:00