nextcloud/apps/files/templates
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
..
admin.php removing executable bit - again 2012-05-15 00:52:00 +02:00
index.php Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
part.breadcrumb.php Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 2012-05-17 15:38:28 -04:00
part.list.php removing executable bit - again 2012-05-15 00:52:00 +02:00