yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-14 00:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing save conflict

Browse Source
This commit is contained in:
Jim Laurie 2018-01-23 11:32:40 +01:00
parent a6e78f023b
commit 9ddd7f12a8
14 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-plugin-users-permissions/config/functions/bootstrap.js vendored
View File

@ -57,12 +57,8 @@ module.exports = cb => {
'user:email' 'user:email'
] ]
}, },
<<<<<<< HEAD
linkedin2: {
enabled: false,
=======
twitter: { twitter: {
>>>>>>> eb1d1645fd14de170fb55d6ca4c570eb9c82733c enabled: false,
key: '', key: '',
secret: '', secret: '',
callback: '/auth/twitter/callback' callback: '/auth/twitter/callback'

2
packages/strapi-plugin-users-permissions/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi-plugin-users-permissions", "name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.8", "version": "3.0.0-alpha.8.3",
"description": "Protect your API with a full-authentication process based on JWT", "description": "Protect your API with a full-authentication process based on JWT",
"strapi": { "strapi": {
"name": "Auth & Permissions", "name": "Auth & Permissions",