Merge branch 'feat_1' of http://gitlab.uiiai.com/xuanweiace/accessibility_movie_2 into feat_1
Conflicts:
main_window.py
Showing
images/slider.svg
0 → 100644
This diff is collapsed.
render.py
0 → 100644
Please
register
or
sign in
to comment