Commit dccde9a
Merge branch 'upstream/dev' into feat/subscription-multi-provider
Resolved conflicts in luci-app-openclash/luasrc/view/openclash/status.htm
- Preserved multi-provider subscription display feature
- Kept backward compatibility with single subscription sources
- Integrated upstream updates from dev branch
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <[email protected]>File tree
102 files changed
+1467
-1866
lines changed- .github/workflows
- luci-app-openclash
- luasrc
- controller
- model/cbi/openclash
- view/openclash
- po/zh-cn
- root
- etc
- init.d
- openclash/custom
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
102 files changed
+1467
-1866
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
104 | 103 | | |
105 | 104 | | |
106 | 105 | | |
| |||
124 | 123 | | |
125 | 124 | | |
126 | 125 | | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | 126 | | |
137 | 127 | | |
138 | 128 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
0 commit comments