averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-05 12:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
4e2cdb2f8af807767a978a175ef5415cd3d651eb
nextcloud-server-mirror/settings/admin
T
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