Add the merge user function

This commit is contained in:
Skia
2016-09-21 14:09:16 +02:00
parent f1e54439e1
commit 9e4e9597d1
15 changed files with 249 additions and 99 deletions

View File

@ -6,7 +6,6 @@
{% endblock %}
{% block content %}
<div id="user_profile_container">
<div id="user_profile">
<div id="right_column">