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	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
appinfo	Remove OC_App::register function	2012-05-31 13:01:30 +02:00
css	added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts	2012-04-27 13:19:16 +01:00
js	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
templates	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
history.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
versions.php	Merge branch 'unstable'	2012-06-04 23:02:05 +02:00