averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-27 18:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4ef94ddd2eb87afe4cd8a0de3b70f32bbd9328fc
nextcloud-server-mirror/settings/admin
History
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting 
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
..
controller.php
Merge branch 'master' into type-hinting
2014-03-31 21:38:54 +02:00