Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / templates / cas /
drwxr-xr-x   ..
-rw-r--r-- 526 login.html
-rw-r--r-- 269 logout.html
-rw-r--r-- 523 merge.html