Skip to content
Snippets Groups Projects
Commit 74fdccc1 authored by Andre Loreth's avatar Andre Loreth
Browse files

Merge origin/master

Conflicts:
	entity/Task_entity/Task_entity.aod
parents fe46dcc8 0c8092e4
No related branches found
No related tags found
No related merge requests found
Showing
with 169 additions and 71 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 to comment