Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

Admin message

Gitlab Maintenance 11.04.2025 | 20:00 - 23:00 MEZ

151b315b

Commit 151b315b authored 5 years ago by Dominik Lechner

Downloads
- Plain Diff

Merge branch 'translation'

# Conflicts:
#	entity/Address_entity/Address_entity.aod
#	entity/Salesproject_entity/Salesproject_entity.aod

parents f0cfe5e1 63aad0a9

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

entity/Address_entity/Address_entity.aod 1 addition, 1 deletion

entity/Address_entity/Address_entity.aod
entity/CampaignStep_entity/CampaignStep_entity.aod 4 additions, 4 deletions

entity/CampaignStep_entity/CampaignStep_entity.aod
entity/Campaign_entity/Campaign_entity.aod 2 additions, 2 deletions

entity/Campaign_entity/Campaign_entity.aod
entity/Document_entity/Document_entity.aod 4 additions, 4 deletions

entity/Document_entity/Document_entity.aod
entity/Offer_entity/Offer_entity.aod 2 additions, 2 deletions

entity/Offer_entity/Offer_entity.aod
entity/Person_entity/Person_entity.aod 1 addition, 1 deletion

entity/Person_entity/Person_entity.aod
entity/Salesproject_entity/Salesproject_entity.aod 1 addition, 0 deletions

entity/Salesproject_entity/Salesproject_entity.aod
entity/Task_entity/Task_entity.aod 1 addition, 1 deletion

entity/Task_entity/Task_entity.aod
language/_____LANGUAGE_de/_____LANGUAGE_de.aod 21 additions, 1 deletion

language/_____LANGUAGE_de/_____LANGUAGE_de.aod
language/_____LANGUAGE_en/_____LANGUAGE_en.aod 9 additions, 8 deletions

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

with 46 additions and 24 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