summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-20 19:11:56 -0500
committerGitHub <noreply@github.com>2017-05-20 19:11:56 -0500
commit6521b6e9a06ebc40820dfa928aeb3976d82b066c (patch)
tree6a41ee2041d0a46956976d76ebe6f2cc3fb3fb2a /core
parentc677f494696f86ea2eebb484467c610384d4ad62 (diff)
parent7a8bd735478fb7dea2daa30bae10023e8e9fc77a (diff)
downloadnextcloud-server-6521b6e9a06ebc40820dfa928aeb3976d82b066c.tar.gz
nextcloud-server-6521b6e9a06ebc40820dfa928aeb3976d82b066c.zip
Merge pull request #4983 from nextcloud/master-oauth-not-disable
Mark OAuth app as always enabled
Diffstat (limited to 'core')
-rw-r--r--core/shipped.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/shipped.json b/core/shipped.json
index 306131405e2..83eb3a29787 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -41,6 +41,7 @@
"federatedfilesharing",
"lookup_server_connector",
"provisioning_api",
+ "oauth2",
"twofactor_backupcodes",
"workflowengine"
]