format_html was missing in optional_logout template-tag#3556

Merged

jpadilla merged 6 commits intoencode:masterfrom rense:master

Oct 28, 2015

+2-1

Commits on Mar 2, 2015

Merge pull request #1 from tomchristie/master
rense
committed

Commits on Mar 9, 2015

Update from upstream
Rense VanderHoek
committed

Commits on Apr 18, 2015

Merge remote-tracking branch 'upstream/master'
rense
committed

Commits on Oct 10, 2015

Merge branch 'master' of https://github.com/rense/django-rest-framework
rense
committed

Commits on Oct 28, 2015