Merge branch 'pretzel' into 'pretzel-unstable'

Updating unstable with stable due to changes made in stable.

See merge request crafty-controller/crafty-commander!33
This commit is contained in:
Andrew 2021-08-08 15:36:10 +00:00
commit 28e8bfd7ac
2 changed files with 2 additions and 2 deletions

View File

@ -95,7 +95,7 @@
</div>
<button type="submit" class="btn btn-success mr-2">Save</button>
<button type="reset" class="btn btn-light">Cancel</button>
<button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light">Cancel</button>
</form>
</div>

View File

@ -164,7 +164,7 @@
</div>
<button type="submit" class="btn btn-success mr-2">Save</button>
<button type="reset" class="btn btn-light">Cancel</button>
<button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light">Cancel</button>
</form>
</div>