From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 16 Oct 2013 18:45:54 +0000 (-0700)
Subject: Merge pull request #5157 from owncloud/fixing-appframework-master
X-Git-Tag: v6.0.0beta2~103
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a;p=nextcloud-server.git

Merge pull request #5157 from owncloud/fixing-appframework-master

Fixing appframework for OC6
---

2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a