Commit 3ec2532d authored by Thorfin89's avatar Thorfin89

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	init
#	rw_pupitre.py
parents 518e54dd 533f8e9b
43 60
\ No newline at end of file \ No newline at end of file
Markdown is supported
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