language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod · ab777e0968a8e05f5a7f885d6f5668e6fe0ed3b5 · xrm / basic

Something went wrong on our end

6 years ago

Merge branch 'master' of gitlab.adito.de:xrm/basic · ab777e09

Maximilian Schröger authored 6 years ago

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

ab777e09

History

Merge branch 'master' of gitlab.adito.de:xrm/basic

Maximilian Schröger authored 6 years ago

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod