diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
| commit | 8cc9ae059ffa6e484d24149ff7508555bfaed1b6 (patch) | |
| tree | d9c8dde5cfb2537e83ffedad1e3490608c9943b2 /sites/www/blog | |
| parent | 935c55dd1f596f97bd8c3d76dd8abfe9cffaa8b0 (diff) | |
| parent | a83f0d3038e8d16e7c160293d16c2736645564d6 (diff) | |
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites/www/blog')
| -rw-r--r-- | sites/www/blog/first-post.rst | 7 | ||||
| -rw-r--r-- | sites/www/blog/second-post.rst | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sites/www/blog/first-post.rst b/sites/www/blog/first-post.rst new file mode 100644 index 00000000..7b075073 --- /dev/null +++ b/sites/www/blog/first-post.rst @@ -0,0 +1,7 @@ +=========== +First post! +=========== + +A blog post. + +.. date:: 2013-12-04 diff --git a/sites/www/blog/second-post.rst b/sites/www/blog/second-post.rst new file mode 100644 index 00000000..c4463f33 --- /dev/null +++ b/sites/www/blog/second-post.rst @@ -0,0 +1,7 @@ +=========== +Another one +=========== + +.. date:: 2013-12-05 + +Indeed! |