[django/django] 706ece: Update flatpages.txt

[GitHub]

Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 706eced9bb9012788494c14566577ed691924e82
https://github.com/django/django/commit/706eced9bb9012788494c14566577ed691924e82
Author: Camilo Nova <camil...@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Changed paths:
M docs/ref/contrib/flatpages.txt

Log Message:
-----------
Update flatpages.txt

Fixed typo


Commit: a643e4d200e12d1570174fec343a27d6bc47f735
https://github.com/django/django/commit/a643e4d200e12d1570174fec343a27d6bc47f735
Author: Tim Graham <timog...@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths:
M docs/ref/contrib/flatpages.txt

Log Message:
-----------
Merge pull request #1255 from camilonova/patch-2

Made URL patterns consistent in docs/ref/contrib/flatpages.txt


Compare: https://github.com/django/django/compare/af70dfcf317f...a643e4d200e1