mk200789 10a45a3c2b resolve merge conflict vor 10 Jahren
..
migrations 0ec00d2ca4 included userinfo in template vor 10 Jahren
scripts 0ec00d2ca4 included userinfo in template vor 10 Jahren
static 0ec00d2ca4 included userinfo in template vor 10 Jahren
templates 10a45a3c2b resolve merge conflict vor 10 Jahren
unittests 0ec00d2ca4 included userinfo in template vor 10 Jahren
__init__.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
admin.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
forms.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
models.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
serializers.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
tests.py 0ec00d2ca4 included userinfo in template vor 10 Jahren
urls.py 10a45a3c2b resolve merge conflict vor 10 Jahren
views.py 10a45a3c2b resolve merge conflict vor 10 Jahren