Moved `merge` argument into `**kwargs`.
[django-cas-provider.git] / cas_provider / templates /
2012-01-18 dwickwireAdding basic merge template
2011-10-28 dwickwireAdded 'remember me' functionality to view
2009-03-18 Chris WilliamsAdditional documentation and cleaned up imports in...