Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / templates / cas / merge.html
2012-01-18 dwickwireAdding basic merge template