Skip to content
Commit 4c1bc64b authored by Pierre Ozoux's avatar Pierre Ozoux
Browse files

Merge branch 'master' into 'feature/apps-timetracker' 

# Conflicts:
#   base/apps/install-list
parents 68696839 27796b9c
Pipeline #1214 failed with stages
in 18 seconds
Hide whitespace changes
Inline Side-by-side
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