Elliot DeNolf f0ac9d6935 fix conflicts

2020-11-21 02:11:20 -05:00

..

access

renames policy to access

2020-07-08 11:00:50 -04:00

blocks

passes depth to all afterRead performFieldOperations

2020-07-20 12:44:29 -04:00

client

renames client to admin, sets up component library

2020-10-10 18:28:17 -04:00

collections

convert src/collections

2020-11-20 14:54:47 -05:00

globals

replaces strict access control in global

2020-07-20 17:44:08 -04:00

custom-index.html

Implement custom index

2020-08-23 07:26:02 -04:00

payload.config.js

reinstate all collections in config

2020-11-20 13:41:54 -05:00

server.js

fix conflicts

2020-11-21 02:11:20 -05:00