]> source.dussan.org Git - nextcloud-server.git/commit
Fix conflict
authorThomas Tanghus <thomas@tanghus.net>
Mon, 23 Sep 2013 21:48:28 +0000 (23:48 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 23 Sep 2013 21:48:28 +0000 (23:48 +0200)
commit7cad510f28e3d80de06cb98bbc5915b26dfa35d3
tree8bb436bb98d0d557abc5a2168e52af96ac6ac9e0
parentf022ea752ddd86feccaaf5f1f83f808fd6df5e20
parentd27416edf767219f77a828d22bb070345a179631
Fix conflict
lib/server.php