Merge remote-tracking branch 'lofd/master' into mergable

mergable
Zoltan the DM 2023-10-20 17:11:07 -07:00
commit d7f3159efa
2 changed files with 8 additions and 0 deletions

View File

@ -12,7 +12,11 @@
</select></dd>
</dl>
<button id="reset-item-filter">{{localize "CMPBrowser.Filters.ResetFilters"}}</button>
<<<<<<< HEAD
<!-- <button id="copy-search-item">Export to <i class="fa-brands fa-square-js"></i></button> -->
=======
<button id="copy-search-item">Export to JS</button>
>>>>>>> lofd/master
</div>
{{> "modules/compendium-browser/template/filter-container.html" filters=itemFilters}}
</div>

View File

@ -13,7 +13,11 @@
</select></dd>
</dl>
<button id="reset-npc-filter">{{localize "CMPBrowser.Filters.ResetFilters"}}</button>
<<<<<<< HEAD
<!-- <button id="copy-search-npc">Export to <i class="fa-brands fa-square-js"></i></button> -->
=======
<button id="copy-search-npc">Export to JS</button>
>>>>>>> lofd/master
</div>
{{> "modules/compendium-browser/template/filter-container.html" filters=npcFilters}}
</div>