Commits · master · peterbenjamin2000 / dalszöveg

11 Mar, 2020 2 commits
- Merge branch 'parody' into 'master' · a58755ed
  peterbenjamin2000 authored Mar 11, 2020
```
Parody

See merge request !1
```
  a58755ed
- Merge branch 'master' into 'parody' · 78fe656f
  peterbenjamin2000 authored Mar 11, 2020
```
# Conflicts:
#   track.txt
```
  78fe656f
10 Mar, 2020 6 commits
- Merge branch 'tormakris-master-patch-34052' into 'master' · ec86c3d0
  Torma Kristóf authored Mar 11, 2020
```
Update track.txt

See merge request tormakris/dalsz-veg!3
```
  ec86c3d0
- Update track.txt · 5fd144fa
  Torma Kristóf authored Mar 11, 2020
  
  5fd144fa
- Merge branch 'tormakris-master-patch-59822' into 'master' · cfd3d77b
  Torma Kristóf authored Mar 10, 2020
```
Update track.txt

See merge request tormakris/dalsz-veg!1
```
  cfd3d77b
- Update track.txt · 401cb5ef
  Torma Kristóf authored Mar 10, 2020
  
  401cb5ef
- Update track.txt · 00ae9783
  Torma Kristóf authored Mar 10, 2020
  
  00ae9783
- add track.txt · 45a45a86
  Torma Kristóf authored Mar 10, 2020
  
  45a45a86