Norman Jäckel 31e47e0ac5 Merge pull request #2308 from FinnStutzenstein/Issue1213 ... Handle duplicates during user import (fixes #1213)		2016-08-31 13:05:03 +02:00
..
js/users	Handle duplicates during user import	2016-08-31 12:23:38 +02:00
templates/users	Merge pull request #2308 from FinnStutzenstein/Issue1213	2016-08-31 13:05:03 +02:00