Merge branch 'master' of https://github.com/TanninOne/modorganizer into archive_cleanup

# Conflicts:
#	src/installationmanager.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
index 2806921f..ea5d2141 100644
--- a/src/aboutdialog.ui
+++ b/src/aboutdialog.ui
@@ -90,7 +90,7 @@
          <item>

           <widget class="QLabel" name="label_2">

            <property name="text">

-            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;&lt;p&gt;See the GNU General Public License for more details.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

+            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;&lt;p&gt;See the GNU General Public License for more details.&lt;/p&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/TanninOne/modorganizer&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

            </property>

            <property name="wordWrap">

             <bool>true</bool>