Merge origin/master
Conflicts: language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod language/_____LANGUAGE_de/_____LANGUAGE_de.aod language/_____LANGUAGE_en/_____LANGUAGE_en.aod
Showing
- entity/Pers_entity/entityfields/image/onValueChange.js 1 addition, 1 deletionentity/Pers_entity/entityfields/image/onValueChange.js
- entity/Pers_entity/entityfields/image/valueProcess.js 1 addition, 1 deletionentity/Pers_entity/entityfields/image/valueProcess.js
- entity/Pers_entity/recordcontainers/db/onDBUpdate.js 1 addition, 1 deletionentity/Pers_entity/recordcontainers/db/onDBUpdate.js
- neonView/PersEdit_view/PersEdit_view.aod 4 additions, 0 deletionsneonView/PersEdit_view/PersEdit_view.aod
- process/OfferOrder_lib/process.js 1 addition, 1 deletionprocess/OfferOrder_lib/process.js
Loading
Please register or sign in to comment