Skip to content

format_html was missing in optional_logout template-tag #3556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpadilla merged 6 commits into from
Oct 28, 2015
Merged

format_html was missing in optional_logout template-tag #3556

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8348008
Merge pull request #1 from tomchristie/master
rense Mar 2, 2015
b172ed0
Update from upstream
Mar 9, 2015
5b7404c
Merge remote-tracking branch 'upstream/master'
rense Apr 18, 2015
c774a4c
Merge branch 'master' of https://github.com/rense/django-rest-framework
rense Oct 10, 2015
6aef157
Merge remote-tracking branch 'tomchristie/master'
rense Oct 28, 2015
0d568ed
format_html was missing in optional_logout template-tag
rense Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' 
* upstream/master: (54 commits)
  docs/renderers: `StaticHTMLRenderer` instead of `TemplateHTMLRenderer`
  Django 1.8 is no longer in beta
  Removed deprecated '.model' attribute check
  Update example of nested data
  Update serializers documentation (removed feature)
  more sp fixes
  Fix typo.
  Workaround for bug in pip
  Test against Django's master branch
  Django 1.8 released
  Should use "ordering" in model Meta, not order_by
  `query_params` in favor of `QUERY_PARAMS`
  Fixed docstring typo
  Reference typos in fields.md
  Use default reason phrases from HTTP standard.
  Metadata should detect null boolean field type.
  Fix older release notes link
  Try to resolve pep8 versioning clash.
  Swapping to hassattr logic for pk attribute references in relations
  Added enhancement for pk reference in many=True relations
  ...
  • Loading branch information
@rense
rense committed Apr 18, 2015
commit 5b7404cb9cae03173161988ccbd590f5f5cb4c15

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.