Commits · master · Lernflix / webapp

31 Aug, 2021 1 commit
- Enter im Chat als Sende Funktion test · b64dba53
  Andre Helgert authored Aug 31, 2021
  
  b64dba53
25 Jun, 2021 1 commit
- Lizenz hinzugefügt · 0e3fc77c
  Andre Helgert authored Jun 25, 2021
  
  0e3fc77c
29 Apr, 2021 7 commits
- Anpassungen Merge · 6303d59e
  Andre Helgert authored Apr 29, 2021
  
  6303d59e
- Anpassungen Merge · 93273eda
  Andre Helgert authored Apr 29, 2021
  
  93273eda
- Anpassungen Merge · 84bd5975
  Andre Helgert authored Apr 29, 2021
  
  84bd5975
- Merge branch 'andre' · d82c9d55
  Andre Helgert authored Apr 29, 2021
  
  d82c9d55
- Merge remote-tracking branch 'origin/master' · bbdbeb82
  Andre Helgert authored Apr 29, 2021
```
# Conflicts:
#	public/cssOld/less/chat.css
#	public/cssOld/less/controls.css
#	public/cssOld/less/navigation.css
#	public/cssOld/less/room.css
#	public/cssOld/less/style.css
#	public/cssOld/less/video.css
#	public/html/index.html
#	public/js/main.js
```
  bbdbeb82
- gh · 3c71088f
  Andre Helgert authored Apr 29, 2021
  
  3c71088f
- Finale Anpassungen · b96e6bcb
  Andre Helgert authored Apr 29, 2021
  
  b96e6bcb
27 Apr, 2021 15 commits
- Anpassung von Okan · c4675203
  Andre Helgert authored Apr 27, 2021
  
  c4675203
- Anpassung von Okan · 71934b18
  Andre Helgert authored Apr 27, 2021
  
  71934b18
- Anpassung von Okan · dab13f55
  Andre Helgert authored Apr 27, 2021
  
  dab13f55
- Anpassung von Okan · 291f17f3
  Andre Helgert authored Apr 27, 2021
  
  291f17f3
- Anpassung von Okan · 720e318d
  Andre Helgert authored Apr 27, 2021
  
  720e318d
- Anpassung von Okan · 4483f02b
  Andre Helgert authored Apr 27, 2021
  
  4483f02b
- Anpassung von Okan · 16f94f3f
  Andre Helgert authored Apr 27, 2021
  
  16f94f3f
- Anpassungen Merge · 94f972b9
  Andre Helgert authored Apr 27, 2021
  
  94f972b9
- Merge branch 'heroku' · b09ec71d
  Andre Helgert authored Apr 27, 2021
```
# Conflicts:
#	public/css/main.css
#	public/html/index.html
#	public/js/main.js
```
  b09ec71d
- Merge remote-tracking branch 'ghhggh/heroku' into heroku · 64532ad1
  Andre Helgert authored Apr 27, 2021
```
# Conflicts:
#	public/html/index.html
#	public/js/main.js
```
  64532ad1
- Anpassungen Merge · 4bc4a9ae
  Andre Helgert authored Apr 27, 2021
  
  4bc4a9ae
- Css · 354bcb8a
  okanb-Home authored Apr 27, 2021
  
  354bcb8a
- Merge remote-tracking branch 'ghhggh/heroku' · 5f335f7f
  Andre Helgert authored Apr 27, 2021
  
  5f335f7f
- Merge with Branch progress of Andre · 4ce5d557
  Barlium authored Apr 27, 2021
  
  4ce5d557
- Frontend · a5d4c265
  okanb-Home authored Apr 27, 2021
  
  a5d4c265
26 Apr, 2021 16 commits
- Feedback Button · 054aa443
  Andre Helgert authored Apr 26, 2021
  
  054aa443
- Feedback Button · 05037f41
  Andre Helgert authored Apr 26, 2021
  
  05037f41
- Feedback Button · 4382d26a
  Andre Helgert authored Apr 26, 2021
  
  4382d26a
- Feedback Button · d205b3dc
  Andre Helgert authored Apr 26, 2021
  
  d205b3dc
- Feedback Button · 3d72f019
  Andre Helgert authored Apr 26, 2021
  
  3d72f019
- Feedback Button · cb9e48ee
  Andre Helgert authored Apr 26, 2021
  
  cb9e48ee
- Feedback Button · 35601812
  Andre Helgert authored Apr 26, 2021
  
  35601812
- Feedback Button · 2b0017a6
  Andre Helgert authored Apr 26, 2021
  
  2b0017a6
- Feedback Button · 7a57375f
  Andre Helgert authored Apr 26, 2021
  
  7a57375f
- Feedback Button · 7ae7c764
  Andre Helgert authored Apr 26, 2021
  
  7ae7c764
- Feedback Button · 6b58ae30
  Andre Helgert authored Apr 26, 2021
  
  6b58ae30
- Feedback Button · 4703b7a8
  Andre Helgert authored Apr 26, 2021
  
  4703b7a8
- Feedback Button · 406a3801
  Andre Helgert authored Apr 26, 2021
  
  406a3801
- Feedback Button · a2429d34
  Andre Helgert authored Apr 26, 2021
  
  a2429d34
- Feedback Button · c5aa146b
  Andre Helgert authored Apr 26, 2021
  
  c5aa146b
- Feedback Button · 63f9330a
  Andre Helgert authored Apr 26, 2021
  
  63f9330a