Commit f0b1d9c
committed
Merge branch 'fork/marc-vdm/major_search' into major-search
# Conflicts:
# activity_browser/bwutils/__init__.py
# activity_browser/bwutils/metadata.py
# activity_browser/layouts/panes/database_products.py
# activity_browser/ui/widgets/__init__.py
# activity_browser/ui/widgets/item_model.py
# activity_browser/ui/widgets/tree_view.pyFile tree
6 files changed
+1756
-10
lines changed- activity_browser
- bwutils/searchengine
- ui/widgets
- tests
6 files changed
+1756
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
0 commit comments