Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pretzel' into 'pretzel-unstable'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/frontend/templates/panel/panel_edit_role.html
View File

@ -95,7 +95,7 @@
</div> </div>
<button type="submit" class="btn btn-success mr-2">Save</button> <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> </form>
</div> </div>

2
app/frontend/templates/panel/panel_edit_user.html
View File

@ -164,7 +164,7 @@
</div> </div>
<button type="submit" class="btn btn-success mr-2">Save</button> <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> </form>
</div> </div>