4fb0bf67ba
Manually merged. Conflicts: src/browser/settings.jsx src/common/settings.js |
||
---|---|---|
.. | ||
components | ||
css | ||
js | ||
menus | ||
webview | ||
index.html | ||
index.jsx | ||
settings.html | ||
settings.jsx |
4fb0bf67ba
Manually merged. Conflicts: src/browser/settings.jsx src/common/settings.js |
||
---|---|---|
.. | ||
components | ||
css | ||
js | ||
menus | ||
webview | ||
index.html | ||
index.jsx | ||
settings.html | ||
settings.jsx |