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
..
album.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
hooks_handlers.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
images_utils.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
photo.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
scanner.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
sharing.php	removing executable bit - again	2012-05-15 00:52:00 +02:00