Skip to content

Commit

Permalink
Merge branch 'master' into 'development'
Browse files Browse the repository at this point in the history
# Conflicts:
#   default/app.conf
  • Loading branch information
hl-tstrawbridge committed Jun 16, 2023
2 parents 56c5738 + 5b63751 commit b76a65d
Show file tree
Hide file tree
Showing 84 changed files with 15,147 additions and 526 deletions.
2 changes: 1 addition & 1 deletion app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": {
"group": null,
"name": "broken_hosts",
"version": "4.1.2"
"version": "4.1.5"
},
"author": [
{
Expand Down
201 changes: 103 additions & 98 deletions appserver/static/components/BHTableView.js

Large diffs are not rendered by default.

0 comments on commit b76a65d

Please sign in to comment.