Merge pull request #3665 from owncloud/2-0updates
authorCarla Schroder <carla@owncloud.com>
Thu, 27 Aug 2015 08:28:03 +0000 (10:28 +0200)
committerCarla Schroder <carla@owncloud.com>
Thu, 27 Aug 2015 08:28:03 +0000 (10:28 +0200)
commitccfcdff190494d95541bf2862aee430633bf4413
tree61f7ee9887a7c611c71491fa2fdaaa4bb90b16f9
parent22d87218b7f653f30120d295c17351d67ee773d0
parent45835f1cf91b080f6e59ee0127576c8edd14470a
Merge pull request #3665 from owncloud/2-0updates

1st batch of updates for 2.0