mirror of
https://github.com/chinchang/web-maker.git
synced 2025-02-22 14:15:03 +01:00
merge: resolve conflict n merge master
This commit is contained in:
commit
ef38035e55
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "web-maker",
|
||||
"version": "2.9.7",
|
||||
"version": "2.9.8",
|
||||
"description": "A blazing fast & offline web playground",
|
||||
"main": "index.html",
|
||||
"devDependencies": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "Web Maker",
|
||||
"version": "2.9.7",
|
||||
"version": "2.9.8",
|
||||
"manifest_version": 2,
|
||||
"description": "Blazing fast & offline playground for your web experiments",
|
||||
"homepage_url": "https://webmakerapp.com",
|
||||
|
@ -29,7 +29,7 @@
|
||||
</head>
|
||||
<body>
|
||||
<h3>Settings <span style="opacity: 0.6;font-size:0.7em;">
|
||||
v2.9.7</span></h3>
|
||||
v2.9.8</span></h3>
|
||||
<form name="optionsForm">
|
||||
<label>
|
||||
<input type="checkbox" name="preserveLastCode">
|
||||
|
Loading…
x
Reference in New Issue
Block a user