averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
587a8df5668cca01cd7d928160661df583d5a7fe
nextcloud-server-mirror/settings/admin/controller.php
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

3.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink