Skia 9e4e9597d1 Add the merge user function		2016-09-21 14:09:26 +02:00
..
migrations	Add the merge user function	2016-09-21 14:09:26 +02:00
templates/rootplace	Add the merge user function	2016-09-21 14:09:26 +02:00
__init__.py	Add the merge user function	2016-09-21 14:09:26 +02:00
admin.py	Add the merge user function	2016-09-21 14:09:26 +02:00
models.py	Add the merge user function	2016-09-21 14:09:26 +02:00
tests.py	Add the merge user function	2016-09-21 14:09:26 +02:00
urls.py	Add the merge user function	2016-09-21 14:09:26 +02:00
views.py	Add the merge user function	2016-09-21 14:09:26 +02:00