Commits · main · Dimitri Enns / OfficeTime

Aug 16, 2021
- Merge branch 'develop' into 'main' · b8fe7946
  Dimitri Enns authored Aug 16, 2021
```
Update README.md

See merge request !5
```
  b8fe7946
- Update README.md · 42867340
  Dimitri Enns authored Aug 16, 2021
  
  42867340
- Merge branch 'develop' into 'main' · 784903b7
  Dimitri Enns authored Aug 16, 2021
```
Develop

See merge request !3
```
  784903b7
- Merge branch 'develop' of git.niih.de:de/officetime into develop · f67e144e
  Dimitri Enns authored Aug 16, 2021
  
  f67e144e
- Whiptail update && chmod +x · beab896c
  Dimitri Enns authored Aug 16, 2021
  
  beab896c
- Update LICENSE · c2749b06
  Dimitri Enns authored Aug 16, 2021
  
  c2749b06
- Add LICENSE · 71275c04
  Dimitri Enns authored Aug 16, 2021
  
  71275c04
- Merge branch 'develop' into 'main' · 8f1f8d65
  Dimitri Enns authored Aug 16, 2021
```
Merge it

See merge request !2
```
  8f1f8d65
- Merge branch 'main' into 'develop' · f2e8036d
  Dimitri Enns authored Aug 16, 2021
```
# Conflicts:
#   README.md
```
  f2e8036d
- Update README.md · 438d42ec
  Dimitri Enns authored Aug 16, 2021
  
  438d42ec
- Update README.md · f4f77d1f
  Dimitri Enns authored Aug 16, 2021
  
  f4f77d1f
- Update README.md · 0853f57e
  Dimitri Enns authored Aug 16, 2021
  
  0853f57e
- Init Commit · 78913b6d
  Dimitri Enns authored Aug 16, 2021
  
  78913b6d
- Add new file · e9a06789
  Dimitri Enns authored Aug 16, 2021
  
  e9a06789
- Initial commit · 51277b99
  Dimitri Enns authored Aug 16, 2021
  
  51277b99