Add PrincipalMixin.merge_users()
[cds-indico.git] / indico / 
tree8a57a4b6fa09d5c8932ad78bb003d8f8131ca285
drwxr-xr-x   ..
drwxr-xr-x - MaKaC
-rw-r--r-- 891 __init__.py
drwxr-xr-x - cli
drwxr-xr-x - core
drwxr-xr-x - htdocs
drwxr-xr-x - modules
drwxr-xr-x - testing
drwxr-xr-x - tests
drwxr-xr-x - translations
drwxr-xr-x - util
drwxr-xr-x - web