]> 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>
Thu, 11 Aug 2016 17:40:52 +0000 (19:40 +0200)
commit82bf4796f9eafab5d6353f16b2b29b5f60dc34e4
tree3d4eb85b20de427f3555fc7339bd8d06d9a94f43
parent8261ccce1be32c1467874d537240585c0d841600
Resolve conflict
settings/templates/admin/server.php