Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cristo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

af9a7873

Commit af9a7873 authored 2 years ago by Morgat Mathieu

Downloads
- Plain Diff

Merge branch 'main' into 'sofiane'

# Conflicts:
#   pages/accueil.php

parents 5a97a919 bdace4ed

No related branches found

No related tags found

Loading

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

js/app.js 9 additions, 0 deletions

js/app.js
js/voice.js 189 additions, 25 deletions

js/voice.js
pages/accueil.php 7 additions, 2 deletions

pages/accueil.php
pages/voice.php 5 additions, 1 deletion

pages/voice.php
styles/scss/app.scss 4 additions, 0 deletions

styles/scss/app.scss

with 214 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment