Commits · 6010705c758d42118b4aac60a20263e8c1f5e48f · 20school / 20SchoolT3

11 Dec, 2020 40 commits
- Merge branch 'larmet-master-patch-40818' into 'master' · 6010705c
  BARBI HUGO authored Dec 11, 2020
```
Update README.md

See merge request !169
```
  6010705c
- Update README.md · 56ae5cf0
  LARMET VICTOR authored Dec 11, 2020
  
  56ae5cf0
- Merge branch 'master' into 'master' · e182d50b
  BARBI HUGO authored Dec 11, 2020
```
last commit

See merge request !168
```
  e182d50b
- last commit (jespere) · 6d1fba5e
  AMOCA OKKES authored Dec 11, 2020
  
  6d1fba5e
- debug · b2e57afe
  AMOCA OKKES authored Dec 11, 2020
  
  b2e57afe
- update Cours particulier · 8ef4b91e
  AMOCA OKKES authored Dec 11, 2020
  
  8ef4b91e
- Merge branch 'larmet-master-patch-25926' into 'master' · 8398d4e3
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !167
```
  8398d4e3
- Update Wiki.md · 88c67e8a
  LARMET VICTOR authored Dec 11, 2020
  
  88c67e8a
- Merge branch 'master' into 'master' · cc01c854
  BARBI HUGO authored Dec 11, 2020
```
Add Icon

See merge request !166
```
  cc01c854
- Add Icon · 5bbf1dcc
  BARBI HUGO authored Dec 11, 2020
  
  5bbf1dcc
- Merge branch 'master' into 'master' · 2800cf2d
  BARBI HUGO authored Dec 11, 2020
```
Debug fmParticulier

See merge request !165
```
  2800cf2d
- Merge branch 'master' of git.unistra.fr:20school/20schoolt3 into master · b4741433
  BARBI HUGO authored Dec 11, 2020
  
  b4741433
- frmParti Debug · 0b91c78b
  BARBI HUGO authored Dec 11, 2020
  
  0b91c78b
- Merge branch 'hbarbi-master-patch-93363' into 'master' · 4002a2a9
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !164
```
  4002a2a9
- Update Wiki.md · 2987e698
  BARBI HUGO authored Dec 11, 2020
  
  2987e698
- Debug · bd6d6bfd
  BARBI HUGO authored Dec 11, 2020
  
  bd6d6bfd
- Merge branch 'hbarbi-master-patch-85799' into 'master' · 56580dde
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !163
```
  56580dde
- Update Wiki.md · d8c80751
  BARBI HUGO authored Dec 11, 2020
  
  d8c80751
- Merge branch 'hbarbi-master-patch-63433' into 'master' · e4813531
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !162
```
  e4813531
- Update Wiki.md · 7f295a1e
  BARBI HUGO authored Dec 11, 2020
  
  7f295a1e
- Merge branch 'master' into 'master' · f30b4986
  BARBI HUGO authored Dec 11, 2020
```
update fmRecap + debug

See merge request !160
```
  f30b4986
- Merge branch 'hbarbi-master-patch-58464' into 'master' · 5e52f12c
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !161
```
  5e52f12c
- Update Wiki.md · 04ebf358
  BARBI HUGO authored Dec 11, 2020
  
  04ebf358
- Merge branch 'hbarbi-master-patch-14208' into 'master' · ab47efe2
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !159
```
  ab47efe2
- Update Wiki.md · d0f13453
  BARBI HUGO authored Dec 11, 2020
  
  d0f13453
- debug · 6a7b8d48
  Victor Larmet authored Dec 11, 2020
  
  6a7b8d48
- Merge branch 'hbarbi-master-patch-79466' into 'master' · d1c8e2df
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !158
```
  d1c8e2df
- Update Wiki.md · 775b0e87
  BARBI HUGO authored Dec 11, 2020
  
  775b0e87
- Merge branch 'hbarbi-master-patch-17474' into 'master' · f982f9df
  BARBI HUGO authored Dec 11, 2020
```
Update Wiki.md

See merge request !157
```
  f982f9df
- Update Wiki.md · b4634294
  BARBI HUGO authored Dec 11, 2020
  
  b4634294
- debug · 442002d9
  Victor Larmet authored Dec 11, 2020
  
  442002d9
- debug · 5ce9dfdf
  Victor Larmet authored Dec 11, 2020
  
  5ce9dfdf
- debug · 22dee285
  Victor Larmet authored Dec 11, 2020
  
  22dee285
- 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
- debug · cb6f5368
  Victor Larmet authored Dec 11, 2020
  
  cb6f5368
- 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 20school/20schoolt3!154
```
  cda346f9