diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-29 14:38:58 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-29 14:38:58 -0800 |
| commit | c636b273daf657eb05041ce2528959910e7db162 (patch) | |
| tree | ca4ce0e03286b5d6c9fbcac8d9db6d4e2d5bf1ef /sites/www/blog | |
| parent | 473a9cdf5b22c8bbc4d4e95d419c8bd153f05e21 (diff) | |
| parent | b8d1724f5714c27ad02ae013e87f5531aec041ea (diff) | |
Merge branch '1.10' into 1.11
Conflicts:
dev-requirements.txt
tox.ini
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! |