Merge remote-tracking branch 'upstream/develop' into feature/import-csv-format

This commit is contained in:
seatedscribe
2017-03-16 21:25:38 +01:00
157 changed files with 2325 additions and 519 deletions

View File

@@ -123,9 +123,7 @@
</spacer>
</item>
<item>
<widget class="WelcomeWidget" name="welcomeWidget" native="true">
<zorder>horizontalSpacer_2</zorder>
</widget>
<widget class="WelcomeWidget" name="welcomeWidget" native="true"/>
</item>
<item>
<spacer name="horizontalSpacer_2">