yujunjun/strapi

mirror of https://github.com/strapi/strapi.git synced 2025-10-23 22:10:19 +00:00

History

Aurelsicoko 1ac6a56ce0 Resolve conflicts

2018-01-25 15:26:25 +01:00

..

Resolve conflicts

2018-01-25 15:26:25 +01:00

Resolve conflicts

2018-01-25 15:26:25 +01:00

Resolve conflicts

2018-01-25 15:26:25 +01:00

Created users-permissions documentation folder

2018-01-19 17:31:45 +01:00

middlewares/users-permissions

Move grant middleware in controller action

2018-01-25 09:59:24 +01:00

Resolve conflicts

2018-01-25 13:25:09 +01:00

Resolve conflicts

2018-01-25 15:26:25 +01:00

.editorconfig

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

.gitattributes

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

.gitignore

Resolve conflicts

2018-01-25 13:25:09 +01:00

.npmignore

Add npmignore

2017-12-08 17:32:34 +01:00

package.json

Add important note to PopUpform

2018-01-25 13:45:29 +01:00

README.md

Generate plugin users-permissions and add it to strapi-packages

2017-11-06 11:14:43 +01:00

README.md

Strapi plugin