]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into patch-1
authorJohannesKleine <johannes@was-tun.org>
Sat, 2 Jan 2016 20:56:45 +0000 (21:56 +0100)
committerJohannesKleine <johannes@was-tun.org>
Sat, 2 Jan 2016 20:56:45 +0000 (21:56 +0100)
commit792839b5c1b11c776c646a195db5ef29c26ddc1c
treec0b66719d3f8eb3e27b86ece55fbac4c69f82331
parentc95d1b26255a6127d89e990df1c73966606a2533
parent6ca2da7d5ccb9d3353c64125e196ad5a56ed4cfb
Merge branch 'master' into patch-1