chore: resolve conflicts and merge upstream

This commit is contained in:
flow
2022-03-24 18:24:51 -03:00
121 changed files with 3182 additions and 802 deletions

View File

@ -51,7 +51,7 @@
<item row="0" column="0">
<widget class="QLineEdit" name="searchEdit">
<property name="placeholderText">
<string>Search and filter ...</string>
<string>Search and filter...</string>
</property>
</widget>
</item>