Merge branch 'hotfix/v4.0.1'

Author: mlojewski-me

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.0.1] - 2018-08-11
+### Fixed
+- Leftover lines break the admin page
+
 ## [4.0.0] - 2018-08-11
 ### Added
 - SHA512 Whirlpool hash algorithm
@@ -83,6 +87,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Supported version of ownCloud, Nextcloud: ownCloud 10, Nextcloud 12
 
+[4.0.1]: https://github.com/nextcloud/user_sql/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/nextcloud/user_sql/compare/v4.0.0-rc2...v4.0.0
 [4.0.0-rc2]: https://github.com/nextcloud/user_sql/compare/v4.0.0-rc1...v4.0.0-rc2
 [4.0.0-rc1]: https://github.com/nextcloud/user_sql/compare/v3.1.0...v4.0.0-rc1

appinfo/info.xml

@@ -8,7 +8,7 @@
         Retrieve the users and groups info. Allow the users to change their passwords.
         Sync the users' email addresses with the addresses stored by Nextcloud.
     </description>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <licence>agpl</licence>
     <author>Marcin Łojewski</author>
     <author>Andreas Böhler</author>

templates/admin.php

@@ -71,16 +71,6 @@ function print_select_options(
         echo "</option>";
     }
 
-
-#54: Merge develop-14 into develop Conflicts
-Resolved all conflicts
-2 conflicting files
-CHANGELOG.md
-CHANGELOG.md
-admin.php
-templates/admin.php
-templates/admin.php
-Resolved
     echo "</select>";
     echo "</label></div>";
 }