8 lines
274 B
Plaintext
8 lines
274 B
Plaintext
|
Merge remote-tracking branch 'upstream/master'
|
||
|
|
|
||
|
|
# 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.
|