Merge branch '3.7' into 3.8

Conflicts: lib/Alchemy/Phrasea/Application/Api.php lib/Alchemy/Phrasea/Core/Version.php lib/conf.d/_GV_template.inc
2025-10-13 04:53:26 +00:00 · 2013-09-14 02:02:56 +02:00
parent 34af09ef0b af95d781b2
commit f955163edb
8 changed files with 123 additions and 10 deletions
--- a/lib/classes/API/OAuth2/Application/Navigator.php
+++ b/lib/classes/API/OAuth2/Application/Navigator.php
@@ -9,12 +9,6 @@
 * file that was distributed with this source code.
 */

-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-
 class API_OAuth2_Application_Navigator
 {
    const CLIENT_ID = '\alchemy\phraseanet\id\4f981093aebb66.06844599';