Commits · 54737d93a79af66dc8874c45b9d107a7aa3151d0 · 20school / 20SchoolT3

11 Dec, 2020 12 commits
- Update Wiki.md · 54737d93
  BARBI HUGO authored Dec 11, 2020
  
  54737d93
- Merge branch 'master' into 'master' · d81fc1e3
  BARBI HUGO authored Dec 11, 2020
```
Update Reset Timer

See merge request !156
```
  d81fc1e3
- Debug · 8f106b21
  BARBI HUGO authored Dec 11, 2020
  
  8f106b21
- Debug Reset Timer · 6d73249e
  BARBI HUGO authored Dec 11, 2020
  
  6d73249e
- Debug · 94730992
  BARBI HUGO authored Dec 11, 2020
  
  94730992
- btn Pause + Resize · 87f64280
  BARBI HUGO authored Dec 11, 2020
  
  87f64280
- Merge branch 'master' into 'master' · cda346f9
  BARBI HUGO authored Dec 11, 2020
```
add btnPause & resize

See merge request !154
```
  cda346f9
- Merge branch 'master' of git.unistra.fr:20school/20schoolT3 into master · d494f5bb
  AMOCA OKKES authored Dec 11, 2020
  
  d494f5bb
- resize · c53d05db
  AMOCA OKKES authored Dec 11, 2020
  
  c53d05db
- Merge branch 'hbarbi-master-patch-13020' into 'master' · 5772f9c2
  BARBI HUGO authored Dec 11, 2020
```
Update README.md

See merge request !153
```
  5772f9c2
- Update README.md · 00a32161
  BARBI HUGO authored Dec 11, 2020
  
  00a32161
- Merge branch 'larmet-master-patch-54405' into 'master' · ef4baec1
  BARBI HUGO authored Dec 11, 2020
```
Update README.md

See merge request !152
```
  ef4baec1
10 Dec, 2020 28 commits
- add btnPause · 36165902
  AMOCA OKKES authored Dec 11, 2020
  
  36165902
- Update README.md · 64aa3f95
  LARMET VICTOR authored Dec 10, 2020
  
  64aa3f95
- Merge branch 'master' into 'master' · 577759fc
  BARBI HUGO authored Dec 10, 2020
```
update Play & add btnJury

See merge request !151
```
  577759fc
- debug · 5e760c1e
  AMOCA OKKES authored Dec 10, 2020
  
  5e760c1e
- update Play & add btnJury · acb9994c
  AMOCA OKKES authored Dec 10, 2020
  
  acb9994c
- Merge branch 'master' into 'master' · 71301547
  BARBI HUGO authored Dec 10, 2020
```
Update fmRecap Design + Features

See merge request !150
```
  71301547
- Upgrade fmrRecap Design + Features · 3d02a5f3
  BARBI HUGO authored Dec 10, 2020
  
  3d02a5f3
- frmRecap Update · 17eaa4e6
  BARBI HUGO authored Dec 10, 2020
  
  17eaa4e6
- Merge branch 'master' into 'master' · c827fbe5
  BARBI HUGO authored Dec 10, 2020
```
update bdd compe/effort

See merge request !148
```
  c827fbe5
- debug · dcccc38c
  Victor Larmet authored Dec 10, 2020
  
  dcccc38c
- debug · b36827bb
  Victor Larmet authored Dec 10, 2020
  
  b36827bb
- debut · d05063b8
  Victor Larmet authored Dec 10, 2020
  
  d05063b8
- debut · 28c15fa8
  Victor Larmet authored Dec 10, 2020
  
  28c15fa8
- Merge branch 'master' into 'master' · 409da4db
  BARBI HUGO authored Dec 10, 2020
```
fmRecap Design

See merge request !147
```
  409da4db
- Debug · d6cdea36
  BARBI HUGO authored Dec 10, 2020
  
  d6cdea36
- fmRecap Design · 1c3ba89a
  BARBI HUGO authored Dec 10, 2020
  
  1c3ba89a
- Merge branch 'master' into 'master' · 664a6235
  BARBI HUGO authored Dec 10, 2020
```
update bdd + initBDD

See merge request !145
```
  664a6235
- debug · 9aab7370
  Victor Larmet authored Dec 10, 2020
  
  9aab7370
- Update Design · af739b0d
  BARBI HUGO authored Dec 10, 2020
  
  af739b0d
- Merge branch 'master' into 'master' · 8bf3bb60
  BARBI HUGO authored Dec 10, 2020
```
graphic terminé + ajout formRecap

See merge request !144
```
  8bf3bb60
- debug · f265e601
  Victor Larmet authored Dec 10, 2020
  
  f265e601
- Merge branch 'hbarbi-master-patch-03919' into 'master' · 5b434668
  BARBI HUGO authored Dec 10, 2020
```
Update README.md

See merge request !143
```
  5b434668
- Update README.md · a697beb0
  BARBI HUGO authored Dec 10, 2020
  
  a697beb0
- Merge branch 'hbarbi-master-patch-15998' into 'master' · cb07ca95
  BARBI HUGO authored Dec 10, 2020
```
Update Wiki.md

See merge request !142
```
  cb07ca95
- Update Wiki.md · 74149cc4
  BARBI HUGO authored Dec 10, 2020
  
  74149cc4
- Merge branch 'hbarbi-master-patch-87143' into 'master' · fcd7173c
  BARBI HUGO authored Dec 10, 2020
```
Update Wiki.md

See merge request !141
```
  fcd7173c
- Update Wiki.md · 3d89a5f3
  BARBI HUGO authored Dec 10, 2020
  
  3d89a5f3
- Merge branch 'hbarbi-master-patch-21392' into 'master' · f1b4d956
  BARBI HUGO authored Dec 10, 2020
```
Update Wiki.md

See merge request !140
```
  f1b4d956