Adding basic merge template
authordwickwire <wickwire@gmail.com>
Wed, 18 Jan 2012 17:57:46 +0000 (11:57 -0600)
committerdwickwire <wickwire@gmail.com>
Wed, 18 Jan 2012 17:57:46 +0000 (11:57 -0600)
commit5c23ea6294967989b40bb872ea7547a8544cb5c0
treea1db84cca108a85b2f5dfba59c75177e3f949d75
parentd20955a26f2dbfe2480c601c2e209be1a43060e1
Adding basic merge template
cas_provider/templates/cas/merge.html [new file with mode: 0644]