Merge branch 'Kawohl-master'
authorJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 10:01:52 +0000 (11:01 +0100)
committerJonathan Kawohl <john@owncloud.com>
Wed, 23 Nov 2016 10:01:52 +0000 (11:01 +0100)
commitad437a49f9efa3671fefc8854f6472281c158fef
treea7d511ca7d7ebf2b342615057f10846f04c1b8e8
parent6cc63462b35a4f4eb0d05a9955d8ec243f73f05c
parent6b2282bf0d2b2eada32822e1d2a10d123a4cceaf
Merge branch 'Kawohl-master'
fix conflict