Merge origin/master (9c03083f) · Commits · xrm / basic · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

basic
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

9c03083f

Commit 9c03083f authored 6 years ago by Andreas Schindlbeck

Downloads
- Patches
- Plain Diff

Merge origin/master

Conflicts:
	entity/Pers_entity/Pers_entity.aod
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

parent a19b48ce

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

entity/Appointment_entity/Appointment_entity.aod 7 additions, 2 deletions

entity/Appointment_entity/Appointment_entity.aod
entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js 18 additions, 0 deletions

...ent_entity/entityfields/attendees/possibleItemsProcess.js
entity/Appointment_entity/onInsert.js 3 additions, 2 deletions

entity/Appointment_entity/onInsert.js
neonView/AppointmentEdit_view/AppointmentEdit_view.aod 1 addition, 1 deletion

neonView/AppointmentEdit_view/AppointmentEdit_view.aod
neonView/AppointmentPreview_view/AppointmentPreview_view.aod 1 addition, 0 deletions

neonView/AppointmentPreview_view/AppointmentPreview_view.aod
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod 2 additions, 1 deletion

...ces/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

with 32 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment