2 Commits (bd01e9346941fa85b4bb96a42cecdbc50e51c368)

Author	SHA1	Message	Date
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 +07:00
Bart Visscher	f71fec8cdc	Combine and minimize core and default app css files	2012-05-16 18:53:46 +07:00