From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 18 Nov 2016 14:35:34 +0000 (+0100)
Subject: Merge pull request #840 from nextcloud/theming-icon-endpoint
X-Git-Tag: v11.0RC2~201
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=faee255ff47873ed2f8908c7d6b6e603ded11618;p=nextcloud-server.git

Merge pull request #840 from nextcloud/theming-icon-endpoint

Add dynamic icon creation
---

faee255ff47873ed2f8908c7d6b6e603ded11618
diff --cc apps/theming/tests/Controller/ThemingControllerTest.php
index c9f6ff8a885,9ce4fb86b52..d42e5afb245
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@@ -26,11 -26,10 +26,12 @@@ namespace OCA\Theming\Tests\Controller
  
  use OCA\Theming\Controller\ThemingController;
  use OCA\Theming\Util;
+ use OCP\App\IAppManager;
  use OCP\AppFramework\Http;
  use OCP\AppFramework\Http\DataResponse;
 +use OCP\Files\File;
  use OCP\Files\IRootFolder;
 +use OCP\Files\NotFoundException;
  use OCP\IConfig;
  use OCP\IL10N;
  use OCP\IRequest;