Merge branch 'master' into Freeculture-dev_freeculture

This commit is contained in:
Alexis Metaireau 2011-01-25 16:28:37 +00:00
commit eb9cc3923a
3 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View file

@ -5,3 +5,4 @@
docs/_build
build
dist
output

View file

@ -1,6 +1,7 @@
Oh yeah !
#########
Trop bien !
###########
:lang: fr
:slug: oh-yeah
Et voila du contenu en français

View file

@ -5,6 +5,7 @@ Oh yeah !
:date: 2010-10-20 10:14
:category: bar
:author: Alexis Métaireau
:slug: oh-yeah
Why not ?
=========