]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'appframework-master' of github.com:owncloud/core into appframework...
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 13 Sep 2013 18:57:18 +0000 (20:57 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 13 Sep 2013 18:57:18 +0000 (20:57 +0200)

Trivial merge