]> 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: 0d7d107 f2b9625)
Merge branch 'feature/equal-drinkers'
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 25 Mar 2019 14:16:33 +0000 (15:16 +0100)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 25 Mar 2019 14:16:33 +0000 (15:16 +0100)

Trivial merge