]> source.dussan.org Git - nextcloud-server.git/commit
Fixed merge conflict.
authorThomas Tanghus <thomas@tanghus.net>
Sun, 10 Jun 2012 10:47:47 +0000 (12:47 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Sun, 10 Jun 2012 10:59:36 +0000 (12:59 +0200)
commit746994c2be72672f5c473545ee21f081551cb245
treec928f51b4feaef5de3c5ea3291eabf0c4c14638c
parentbe6848a549d9d5c5fdc224dfd1e22a416d8048a7
Fixed merge conflict.
apps/contacts/js/loader.js