]> 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: c13239e 5ee2a6a)
Merge branch 'feature/config'
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 20 Mar 2019 09:43:38 +0000 (10:43 +0100)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 20 Mar 2019 09:43:38 +0000 (10:43 +0100)

Trivial merge