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

1.9 KiB

Raw Blame History

View Raw