zadam 90fc4b8293 Merge branch 'beta' ... # Conflicts: # docs/backend_api/BAttachment.html # docs/backend_api/BRevision.html # docs/backend_api/BackendScriptApi.html # docs/backend_api/becca_entities_battachment.js.html # docs/backend_api/becca_entities_bblob.js.html # docs/backend_api/becca_entities_brevision.js.html # docs/frontend_api/FNote.html # docs/frontend_api/FrontendScriptApi.html # docs/frontend_api/entities_fattachment.js.html # docs/frontend_api/entities_fblob.js.html # docs/frontend_api/services_frontend_script_api.js.html # package-lock.json # src/public/app/services/frontend_script_api.js		2023-09-06 09:24:41 +02:00
..
backend_api	Merge branch 'beta'	2023-09-06 09:24:41 +02:00
frontend_api	Merge branch 'beta'	2023-09-06 09:24:41 +02:00