merge dev | fix:conflicts
No related branches found
No related tags found
Showing
- build.js 1 addition, 42 deletionsbuild.js
- data/nginx/app.conf 14 additions, 14 deletionsdata/nginx/app.conf
- public/assets/images/learning_theme_2d.png 0 additions, 0 deletionspublic/assets/images/learning_theme_2d.png
- public/assets/images/learning_theme_coding.png 0 additions, 0 deletionspublic/assets/images/learning_theme_coding.png
- public/assets/images/learning_theme_math.png 0 additions, 0 deletionspublic/assets/images/learning_theme_math.png
- public/assets/images/learning_theme_pc.png 0 additions, 0 deletionspublic/assets/images/learning_theme_pc.png
- public/education/education.js 199 additions, 636 deletionspublic/education/education.js
- public/education/gamedev/gamedev.js 555 additions, 0 deletionspublic/education/gamedev/gamedev.js
- public/education/gamedev/index.html 35 additions, 0 deletionspublic/education/gamedev/index.html
- public/games/games.js 16 additions, 18 deletionspublic/games/games.js
- public/main.js 16 additions, 18 deletionspublic/main.js
- public/software-development/software-development.js 16 additions, 18 deletionspublic/software-development/software-development.js
- public/style/pages/education/education.css 3 additions, 3 deletionspublic/style/pages/education/education.css
- public/style/pages/education/subpages/game-studio-club/game-studio-club.css 3 additions, 0 deletions.../education/subpages/game-studio-club/game-studio-club.css
- public/style/pages/games/games.css 3 additions, 3 deletionspublic/style/pages/games/games.css
- public/style/style.css 96 additions, 255 deletionspublic/style/style.css
- src/pages/education/components/popularization.js 0 additions, 196 deletionssrc/pages/education/components/popularization.js
- src/pages/education/education.js 243 additions, 6 deletionssrc/pages/education/education.js
- src/pages/education/education.scss 109 additions, 268 deletionssrc/pages/education/education.scss
- src/pages/education/index.js 0 additions, 2 deletionssrc/pages/education/index.js
Loading
Please register or sign in to comment