Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	studio/ui/about.py
  • Loading branch information
ObaraEmmanuel committed Jun 14, 2020
2 parents c20f636 + f1f58e4 commit 2a4ef90
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2a4ef90

Please sign in to comment.