Skip to content
Snippets Groups Projects
Commit adca86f0 authored by Verbeek, J.M. (Janneke)'s avatar Verbeek, J.M. (Janneke) :speech_balloon:
Browse files

Merge branch 'master' into 'review-window-functionality' 

# Conflicts:
#   umbra/filereader.py
#   umbra/mistake_counter.py
#   umbra/words.py
parents f5ae089b 481b315c
No related branches found
No related tags found
1 merge request!140Review window functionality
Hide whitespace changes
Inline Side-by-side
Showing
with 282 additions and 128 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