[django/django] 722516: [1.7.x] Fixed #23499 -- Error in built-in template...

[GitHub]

Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 722516536e0dd99690ab6df4c27bbceb29df4d5b
https://github.com/django/django/commit/722516536e0dd99690ab6df4c27bbceb29df4d5b
Author: Joseph Dougherty <jos...@jwdougherty.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)

Changed paths:
M docs/ref/templates/builtins.txt

Log Message:
-----------
[1.7.x] Fixed #23499 -- Error in built-in template tag "now" documentation

Backport of ab8248361e0a7b4fc7684eaaa5891e16b8562683 from master.