]> source.dussan.org Git - nextcloud-server.git/commit
Merge pull request #21952 from owncloud/systemtags-fix-conflicts
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 28 Jan 2016 10:57:37 +0000 (11:57 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 28 Jan 2016 10:57:37 +0000 (11:57 +0100)
commitd425b4ffc2f002f9208c4129b21d9e00ed8b95b2
treea7b7aa307dce24d847e7213b7e01f995a1e66479
parentc11337eb22e2511279bf975d4c7197dabe242601
parent714d8c2424323a449f3d4fa9ea81a76260f0014c
Merge pull request #21952 from owncloud/systemtags-fix-conflicts

Fix system tags conflict situations