]> source.dussan.org Git - nextcloud-server.git/commit
Resolve conflict
authorLukas Reschke <lukas@statuscode.ch>
Thu, 11 Aug 2016 17:39:32 +0000 (19:39 +0200)
committerLukas Reschke <lukas@statuscode.ch>
Tue, 16 Aug 2016 19:09:31 +0000 (21:09 +0200)
commit3ad89a76b506a234948019ec5eb8bb3247528c69
treed9921da737f12d89c202b7314cc5958bb09b847e
parentdf3b708cec24153b01450c27ad1a81d370b781e8
Resolve conflict
settings/templates/admin/server.php