Merge branch 'develop' into 'dashboard'
# Conflicts: # src/dashboard.py insyaAllah
Showing
- img/add button.png 0 additions, 0 deletionsimg/add button.png
- img/arrow-left.png 0 additions, 0 deletionsimg/arrow-left.png
- img/arrow-right.png 0 additions, 0 deletionsimg/arrow-right.png
- img/exe-bicycle.gif 0 additions, 0 deletionsimg/exe-bicycle.gif
- img/exe-bridges.gif 0 additions, 0 deletionsimg/exe-bridges.gif
- img/exe-burpees.gif 0 additions, 0 deletionsimg/exe-burpees.gif
- img/exe-crunches.gif 0 additions, 0 deletionsimg/exe-crunches.gif
- img/exe-highknee.gif 0 additions, 0 deletionsimg/exe-highknee.gif
- img/exe-jumpingjack.gif 0 additions, 0 deletionsimg/exe-jumpingjack.gif
- img/exe-lunges.gif 0 additions, 0 deletionsimg/exe-lunges.gif
- img/exe-mountain.gif 0 additions, 0 deletionsimg/exe-mountain.gif
- img/exe-plank.gif 0 additions, 0 deletionsimg/exe-plank.gif
- img/exe-pushup.gif 0 additions, 0 deletionsimg/exe-pushup.gif
- img/exe-russian.gif 0 additions, 0 deletionsimg/exe-russian.gif
- img/exe-situp.gif 0 additions, 0 deletionsimg/exe-situp.gif
- src/controller.py 49 additions, 0 deletionssrc/controller.py
- src/customize.py 224 additions, 86 deletionssrc/customize.py
- src/endOfExercise.py 82 additions, 0 deletionssrc/endOfExercise.py
- src/listlatihan2.py 156 additions, 42 deletionssrc/listlatihan2.py
- src/plan.py 374 additions, 0 deletionssrc/plan.py
Please register or sign in to comment