files: sync from openwrt v19.07 #2690
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aiamadeus
force-pushed
the
amend
branch
3 times, most recently
from
f2535d8
to
d030324
Compare
aiamadeus
changed the title
Closed
aiamadeus
force-pushed
the
amend
branch
2 times, most recently
from
8b9f97e
to
423ae4f
Compare
|
如果努力努力能把luci切过去 就更舒服了 方便写一些东西 我看了下 和官方的差异还是挺大的 |
|
那就没办法了 既然有不兼容性改动就不切
发自我的iPhone
…------------------ Original ------------------
From: AmadeusGhost <[email protected]>
Date: Mon,Jan 13,2020 8:29 PM
To: coolsnowwolf/lede <[email protected]>
Cc: William Chan <[email protected]>, Comment <[email protected]>
Subject: Re: [coolsnowwolf/lede] files: sync from openwrt v19.07 (#2690)
|
aiamadeus
force-pushed
the
amend
branch
6 times, most recently
from
7178d77
to
ca910b4
Compare
|
冲突了？ |
aiamadeus
force-pushed
the
amend
branch
5 times, most recently
from
811704b
to
512933b
Compare
coolsnowwolf
added a commit
that referenced
this pull request
Feb 3, 2020
This reverts commit 2289184.
bigbighill
pushed a commit
to bigbighill/lede
that referenced
this pull request
Feb 6, 2020
This reverts commit 2289184.
bigbighill
added a commit
to bigbighill/lede
that referenced
this pull request
Feb 8, 2020
This reverts commit e3654e5.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
fix issue #2742