nextcloud/apps/gallery
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 some fixes fore movable apps 2012-04-26 14:52:55 +02:00
img gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
js Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
l10n update translations 2012-05-17 00:36:21 +02:00
lib Merge branch 'unstable' 2012-06-04 23:02:05 +02:00
templates 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
sharing.php removing executable bit - again 2012-05-15 00:52:00 +02:00