Merge branch 'integration' into teeradone
Showing
... | @@ -11,8 +11,10 @@ | ... | @@ -11,8 +11,10 @@ |
"cakephp/migrations": "^1.0", | "cakephp/migrations": "^1.0", | ||
"cakephp/plugin-installer": "^1.0", | "cakephp/plugin-installer": "^1.0", | ||
"josegonzalez/dotenv": "2.*", | "josegonzalez/dotenv": "2.*", | ||
"league/oauth2-github": "^2.0", | |||
"maiconpinto/cakephp-adminlte-theme": "^1.0", | "maiconpinto/cakephp-adminlte-theme": "^1.0", | ||
"mobiledetect/mobiledetectlib": "2.*" | "mobiledetect/mobiledetectlib": "2.*", | ||
"muffin/oauth2": "dev-master" | |||
}, | }, | ||
"require-dev": { | "require-dev": { | ||
"cakephp/bake": "^1.1", | "cakephp/bake": "^1.1", | ||
... | ... |
Please
register
or
sign in
to comment