s444417 b6dac34e87 Merge remote-tracking branch 'origin/master' ... # Conflicts: # kelner/.idea/workspace.xml # kelner/main.py		2020-03-22 22:02:45 +01:00
..
vcs.xml	klasa kelner	2020-03-22 21:58:05 +01:00
workspace.xml	klasa kelner	2020-03-22 21:58:05 +01:00