Skip to content
Snippets Groups Projects
Commit 4cd9bf3a authored by Cristian Weiland's avatar Cristian Weiland
Browse files

Merge branch 'master' into 'issue/33' 

# Conflicts:
#   scripts/travel_allowances/insert_travel_allowances.sh
#   scripts/workers/insert_register_payment.sh
parents 5d9998c1 f0f87310
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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