[Pkg-owncloud-commits] [owncloud] 199/239: Merge pull request #6027 from owncloud/public-api-restful-routing-oc6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit a81909097c57c759274290a5a5fac908b909d3ae
Merge: 34704ed 7755e69
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Wed Nov 27 01:55:52 2013 -0800

    Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
    
    fix appframework routing

 lib/private/appframework/app.php                   |  6 +++++-
 .../appframework/routing/routeactionhandler.php    |  2 +-
 lib/public/appframework/app.php                    | 23 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --cc lib/public/appframework/app.php
index 0ff6648,1021a21..9015024
--- a/lib/public/appframework/app.php
+++ b/lib/public/appframework/app.php
@@@ -20,12 -20,8 +20,13 @@@
   *
   */
  
 +/**
 + * Public interface of ownCloud for apps to use.
 + * AppFramework/App class
 + */
 +
  namespace OCP\AppFramework;
+ use OC\AppFramework\routing\RouteConfig;
  
  
  /**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git