Merge pull request #4224 from owncloud/21update
authorDaniel Molkentin <daniel@molkentin.de>
Tue, 1 Dec 2015 14:48:35 +0000 (15:48 +0100)
committerDaniel Molkentin <daniel@molkentin.de>
Tue, 1 Dec 2015 14:48:35 +0000 (15:48 +0100)
commitd2f1c141d8494590be95765aba4eeab95ca9c1c8
tree8f043b65b43fb9239e3af705086c49e8ad04486e
parent76d129605397135c08d0d8f5cd5f7feb5dbc56c0
parent339caf9dc813148ce2f8d3ce2a23ccd09af60816
Merge pull request #4224 from owncloud/21update

updates for 2.1 release