Skip to content
Snippets Groups Projects
Commit 82c7bed8 authored by Dominik Lechner's avatar Dominik Lechner
Browse files

Merge branch 'master' into documentmanagement 

# Conflicts:
#	neonView/KeywordAttributeEdit_view/KeywordAttributeEdit_view.aod
#	neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
#	neonView/TaskMain_view/TaskMain_view.aod
parents d76f5c8c 23d289dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 186 additions and 28 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment