]> rtime.felk.cvut.cz Git - hubacji1/coffee-getter.git/commitdiff
projects / hubacji1 / coffee-getter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1435262 43caa35)
Merge branch 'feature/equal-drinkers-ut'
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 25 Mar 2019 14:29:10 +0000 (15:29 +0100)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 25 Mar 2019 14:29:10 +0000 (15:29 +0100)

Trivial merge