Merge branch 'dev' into 'master'
Dev See merge request !13
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- Makefile 2 additions, 2 deletionsMakefile
- admin-frontend/src/components/create-article-form.js 1 addition, 1 deletionadmin-frontend/src/components/create-article-form.js
- admin-frontend/src/components/update-article-form.js 8 additions, 38 deletionsadmin-frontend/src/components/update-article-form.js
- public/assets/images/screen_mentalo_app.png 0 additions, 0 deletionspublic/assets/images/screen_mentalo_app.png
- public/assets/translations/en.json 3 additions, 1 deletionpublic/assets/translations/en.json
- public/assets/translations/fr.json 2 additions, 1 deletionpublic/assets/translations/fr.json
- public/education/education.js 2 additions, 879 deletionspublic/education/education.js
- public/games/games.js 2 additions, 4503 deletionspublic/games/games.js
- public/main.js 2 additions, 846 deletionspublic/main.js
- public/software-development/software-development.js 2 additions, 984 deletionspublic/software-development/software-development.js
- public/style/style.css 0 additions, 987 deletionspublic/style/style.css
- website/package.json 3 additions, 3 deletionswebsite/package.json
- website/src/pages/education/components/edu-article.js 84 additions, 0 deletionswebsite/src/pages/education/components/edu-article.js
- website/src/pages/education/components/edu-articles.js 60 additions, 0 deletionswebsite/src/pages/education/components/edu-articles.js
- website/src/pages/education/education.js 3 additions, 50 deletionswebsite/src/pages/education/education.js
- website/src/pages/education/education.scss 245 additions, 175 deletionswebsite/src/pages/education/education.scss
- website/src/style.scss 1 addition, 0 deletionswebsite/src/style.scss
Loading
Please register or sign in to comment