]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c11337e 714d8c2)
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)
Fix system tags conflict situations


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server