]> rtime.felk.cvut.cz Git - hubacji1/coffee-getter.git/commitdiff
Merge branch 'feature/group-drinks'
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 3 Apr 2019 06:19:03 +0000 (08:19 +0200)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 3 Apr 2019 06:19:03 +0000 (08:19 +0200)

Trivial merge