Merge remote-tracking branch 'origin/UI-Improvements'

# Conflicts: # src/main/java/mops/gruppen2/controller/Gruppen2Controller.java # src/main/resources/templates/detailsMember.html
2020-03-14 23:47:41 +01:00
parent 916a386179 d3c5ded6d0
commit 1ad3ad8bab
5 changed files with 46 additions and 24 deletions
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@ -43,6 +43,7 @@
                    </div>
                </form>
            </div>
+
            <div class="col-3" style="white-space: nowrap">
                <div>
                    <h2 style="display: inline-block; margin: 0">Mitglieder</h2>