verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vinebrancho/loopback 

Conflicts:
	common/models/application.json
This commit is contained in:
Vine Brancho 2015-01-21 09:55:36 +09:00
parent aebfbf078a cbc6fdb4e3
commit 7144eb7d8c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/application.json
View File

@ -32,7 +32,7 @@
"grantType": {
"type": ["string"],
"description": "Grant type permitted to the application for OAuth 2.0"
"description": "Grant types permitted to the application for OAuth 2.0"
},
"url": {
"type": "string",