Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / templates /
drwxr-xr-x   ..
drwxr-xr-x - cas