8 lines
295 B
Text
8 lines
295 B
Text
|
:X
|
||
|
|
Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel
|
||
|
|
# Please enter a commit message to explain why this merge is necessary,
|
||
|
|
# especially if it merges an updated upstream into a topic branch.
|
||
|
|
#
|
||
|
|
# Lines starting with '#' will be ignored, and an empty message aborts
|
||
|
|
# the commit.
|